Mercurial > ldforge / file diff

--- a/src/gui_actions.cpp	Sun May 19 13:21:06 2013 +0300
+++ b/src/gui_actions.cpp	Sun May 19 13:51:38 2013 +0300
@@ -40,6 +40,9 @@
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
 MAKE_ACTION (newFile, "&New", "brick", "Create a new part model.", CTRL (N)) {
+	if (safeToCloseAll () == false)
+		return;
+	
 	NewPartDialog::StaticDialog ();
 }
 
@@ -47,10 +50,16 @@
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
 MAKE_ACTION (open, "&Open", "file-open", "Load a part model from a file.", CTRL (O)) {
+	if (safeToCloseAll () == false)
+		return;
+	
 	str name = QFileDialog::getOpenFileName (g_win, "Open File", "", "LDraw files (*.dat *.ldr)");
 	
-	if (~name)
-		openMainFile (name);
+	if (name.len () == 0)
+		return;
+	
+	closeAll ();
+	openMainFile (name);
 }
 
 // =============================================================================