[Bug 15970] New logic for choosing stack file saving format

peter-b · peter-b · commit 0d66c07cf163 · 2016-01-08T16:26:52.000Z
If no stack format is requested, try to use the latest one available.

If a specific stack file format is requested, try to save in that
format, and produce an error if doing so would cause data loss.  At
the moment, this means that saving a stack produces an error if the
stack contains widgets and 8.0 format wasn't requested.

If 8.0 stack format is requested, but no widgets are present, use 7.0
format.

Set the `stackfileversion` to "8.0" by default, so that `save stack`
preserves widgets.
diff --git a/engine/src/dispatch.cpp b/engine/src/dispatch.cpp
@@ -1066,20 +1066,22 @@ IO_stat MCDispatch::savestack(MCStack *sptr, const MCStringRef p_fname, uint32_t
     }
     else
     {
-        // MW-2014-12-17: [[ Widgets ]] Force writing out as 8.0 version stack if it
-        //   contains widgets, and only write out as 8.0 if it contains widgets.
-        uint32_t t_old_stackfileversion;
-        t_old_stackfileversion = MCstackfileversion;
-        if (sptr -> haswidgets() || sptr -> substackhaswidgets())
-            MCstackfileversion = 8000;
-        else if (MCstackfileversion == 8000)
-            MCstackfileversion = 7000;
-        
-        stat = dosavestack(sptr, p_fname, MCstackfileversion);
+		/* If no version was specified, assume that 8.0 format was requested */
+		if (UINT32_MAX == p_version)
+		{
+			p_version = 8000;
+		}
+
+		/* If the stack doesn't contain widgets, and 8.0 format was requested,
+		 * use 7.0 format. */
+		if (8000 == p_version && !sptr->haswidgets())
+		{
+			p_version = 7000;
+		}
+
+        stat = dosavestack(sptr, p_fname, p_version);
         
         MCLogicalFontTableFinish();
-        
-        MCstackfileversion = t_old_stackfileversion;
     }
     
 	return stat;
diff --git a/engine/src/globals.cpp b/engine/src/globals.cpp
@@ -384,7 +384,7 @@ MCPlatformSoundRecorderRef MCrecorder;
 #endif
 
 // AL-2014-18-02: [[ UnicodeFileFormat ]] Make stackfile version 7.0 the default.
-uint4 MCstackfileversion = 7000;
+uint4 MCstackfileversion = 8000;
 uint2 MClook;
 MCStringRef MCttbgcolor;
 MCStringRef MCttfont;
@@ -764,7 +764,7 @@ void X_clear_globals(void)
 #endif
     
 	// AL-2014-18-02: [[ UnicodeFileFormat ]] Make 7.0 stackfile version the default.
-	MCstackfileversion = 7000;
+	MCstackfileversion = 8000;
 
     MClook = LF_MOTIF;
     MCttbgcolor = MCSTR("255,255,207");
