diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-03-15 21:57:03 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2016-03-15 21:57:03 +0000 |
| commit | 6bd1c2a30b66e15fe055b22bd47dadb771f7fae2 (patch) | |
| tree | 1b991cc2736f84fb069666802d485bd29cff6394 /src/io/inkjar.cpp | |
| parent | Update to limit options to radius = 0, radious > 0 or both (diff) | |
| parent | fix-bug-1557192. paint-order crash with multiple items (diff) | |
| download | inkscape-6bd1c2a30b66e15fe055b22bd47dadb771f7fae2.tar.gz inkscape-6bd1c2a30b66e15fe055b22bd47dadb771f7fae2.zip | |
Update to trunk
(bzr r13645.1.119)
Diffstat (limited to 'src/io/inkjar.cpp')
| -rw-r--r-- | src/io/inkjar.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/io/inkjar.cpp b/src/io/inkjar.cpp index fb1fedf55..345455c4a 100644 --- a/src/io/inkjar.cpp +++ b/src/io/inkjar.cpp @@ -103,14 +103,19 @@ bool JarFile::init_inflation() bool JarFile::open() { + if (_file != NULL) { + fclose(_file); + } if ((_file = fopen(_filename, "r")) == NULL) { - fprintf(stderr, "open failed.\n"); - return false; + fprintf(stderr, "open failed.\n"); + return false; + } + if (!init_inflation()) { + return false; + } + else { + return true; } - if (!init_inflation()) - return false; - - return true; } bool JarFile::close() |