[rkward-cvs] SF.net SVN: rkward:[3498] trunk/rkward/rkward/windows

[tfry at users.sourceforge.net]

Revision: 3498
          http://rkward.svn.sourceforge.net/rkward/?rev=3498&view=rev
Author:   tfry
Date:     2011-03-25 13:02:04 +0000 (Fri, 25 Mar 2011)

Log Message:
-----------
Fix assert and problem during workplace restoration.

Modified Paths:
--------------
    trunk/rkward/rkward/windows/rkmdiwindow.cpp
    trunk/rkward/rkward/windows/rkworkplace.cpp

Modified: trunk/rkward/rkward/windows/rkmdiwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkmdiwindow.cpp	2011-03-24 14:05:34 UTC (rev 3497)
+++ trunk/rkward/rkward/windows/rkmdiwindow.cpp	2011-03-25 13:02:04 UTC (rev 3498)
@@ -164,7 +164,7 @@
 			}
 			// WORKAROUND end
 
-			deleteLater ();
+			delete this;	// Note: using deleteLater(), here does not work well while restoring workplaces (window is not fully removed from workplace before restoring)
 		}
 		return closed;
 	} else {

Modified: trunk/rkward/rkward/windows/rkworkplace.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkworkplace.cpp	2011-03-24 14:05:34 UTC (rev 3497)
+++ trunk/rkward/rkward/windows/rkworkplace.cpp	2011-03-25 13:02:04 UTC (rev 3498)
@@ -584,7 +584,7 @@
 				RK_ASSERT (false);
 				continue;
 			}
-			params = description[i].mid (typeend + 2, specstart - typeend).split (':');
+			params = description[i].mid (typeend + 2, specstart - typeend - 2).split (':', QString::SkipEmptyParts);
 			specification = description[i].mid (specstart + 2);
 		} else {
 			specification = description[i].mid (typeend +1 );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.