comparison main/main.cpp @ 145:dfaf4f9330b5

* minor usability fixes

     // complete.  As a lazy hack, apply it explicitly from here
     gui.preferenceChanged("Property Box Layout");
 
     bool haveSession = false;
     bool haveMainModel = false;
+    bool havePriorCommandLineModel = false;
 
     for (QStringList::iterator i = args.begin(); i != args.end(); ++i) {
 
         MainWindow::FileOpenStatus status = MainWindow::FileOpenFailed;
 

             }
         }
         if (status != MainWindow::FileOpenSucceeded) {
             if (!haveMainModel) {
                 status = gui.openSomeFile(path, MainWindow::ReplaceMainModel);
-                if (status == MainWindow::FileOpenSucceeded) haveMainModel = true;
+                if (status == MainWindow::FileOpenSucceeded) {
+                    haveMainModel = true;
+                }
             } else {
-                status = gui.openSomeFile(path, MainWindow::CreateAdditionalModel);
+                if (haveSession && !havePriorCommandLineModel) {
+                    status = gui.openSomeFile(path, MainWindow::AskUser);
+                    if (status == MainWindow::FileOpenSucceeded) {
+                        havePriorCommandLineModel = true;
+                    }
+                } else {
+                    status = gui.openSomeFile(path, MainWindow::CreateAdditionalModel);
+                }
             }
         }
         if (status == MainWindow::FileOpenFailed) {
 	    QMessageBox::critical
                 (&gui, QMessageBox::tr("Failed to open file"),