Bugfix : After inserting XML still save as zipped vym release-1-12-maintained
authorinsilmaril
Mon, 01 Dec 2008 16:44:35 +0000
branchrelease-1-12-maintained
changeset 54e47fe0d7b05b
parent 53 1532402be6c2
child 55 79b0656dbe7d
Bugfix : After inserting XML still save as zipped vym
mapeditor.cpp
tex/vym.changelog
version.h
     1.1 --- a/mapeditor.cpp	Mon Nov 24 14:12:01 2008 +0000
     1.2 +++ b/mapeditor.cpp	Mon Dec 01 16:44:35 2008 +0000
     1.3 @@ -1571,6 +1571,10 @@
     1.4  				   "Unknown FileType in MapEditor::load()");
     1.5  		return aborted;	
     1.6  	}
     1.7 +
     1.8 +	// Save original zip state, important for inserting complete maps
     1.9 +	bool zipped_org=zipped;
    1.10 +
    1.11  	if (lmode==NewMap)
    1.12  	{
    1.13  		xelection.clear();
    1.14 @@ -1713,6 +1717,9 @@
    1.15  	// Delete tmpZipDir
    1.16  	removeDir (QDir(tmpZipDir));
    1.17  
    1.18 +	// Restore original zip state
    1.19 +	zipped=zipped_org;
    1.20 +
    1.21  	updateActions();
    1.22  
    1.23  	return err;
     2.1 --- a/tex/vym.changelog	Mon Nov 24 14:12:01 2008 +0000
     2.2 +++ b/tex/vym.changelog	Mon Dec 01 16:44:35 2008 +0000
     2.3 @@ -1,3 +1,8 @@
     2.4 +-------------------------------------------------------------------
     2.5 +Mon Dec  1 17:39:55 CET 2008 - uwedr@suse.de
     2.6 +
     2.7 +- Bugfix: After inserting XML, still write as zipped vym again 
     2.8 +
     2.9  -------------------------------------------------------------------
    2.10  Mon Oct  6 11:17:15 CEST 2008 - uwedr@suse.de
    2.11  
     3.1 --- a/version.h	Mon Nov 24 14:12:01 2008 +0000
     3.2 +++ b/version.h	Mon Dec 01 16:44:35 2008 +0000
     3.3 @@ -7,7 +7,7 @@
     3.4  #define __VYM_VERSION "1.12.2"
     3.5  #define __VYM_CODENAME "Maintenance Update a"
     3.6  //#define __VYM_CODENAME "Codename: development version"
     3.7 -#define __VYM_BUILD_DATE "2008-11-12"
     3.8 +#define __VYM_BUILD_DATE "2008-12-01"
     3.9  
    3.10  
    3.11  bool checkVersion(const QString &);