diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-03-14 16:37:50 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2016-03-14 16:37:50 +0000 |
| commit | b8d22beef5345210ad27cdc2685083aeae6f8f3b (patch) | |
| tree | d69b8bfd19d3627a8425a1b265c2abf229b05354 /src/io/inkjar.cpp | |
| parent | fixes for update to trunk (diff) | |
| parent | "Relative to" option for node alignment. (diff) | |
| download | inkscape-b8d22beef5345210ad27cdc2685083aeae6f8f3b.tar.gz inkscape-b8d22beef5345210ad27cdc2685083aeae6f8f3b.zip | |
update to trunk
(bzr r13708.1.39)
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() |