Origin: upstream
Forwarded: not-needed
Index: 3depict-0.0.16/src/3Depict.cpp
===================================================================
--- 3depict-0.0.16.orig/src/3Depict.cpp	2014-06-03 04:15:59.421246388 +0200
+++ 3depict-0.0.16/src/3Depict.cpp	2014-06-03 04:16:03.689192733 +0200
@@ -457,11 +457,17 @@
 
 
     MainFrame->Show();
-    
+   
+    MainFrame->checkShowTips();
+    MainFrame->checkReloadAutosave();
+
+
     if(commandLineFiles.GetCount())
     	MainFrame->SetCommandLineFiles(commandLineFiles);
 
     MainFrame->fixSplitterWindow();
+
+    MainFrame->finaliseStartup();
     return true;
 }
 
Index: 3depict-0.0.16/src/gui/mainFrame.cpp
===================================================================
--- 3depict-0.0.16.orig/src/gui/mainFrame.cpp	2014-06-03 04:15:59.421246388 +0200
+++ 3depict-0.0.16/src/gui/mainFrame.cpp	2014-06-03 04:16:03.693192682 +0200
@@ -727,12 +727,6 @@
 	    restoreConfigDefaults();
 	
 	
-	
-	//Attempt to load the auto-save file, if it exists
-	//-----------------
-	checkReloadAutosave();
-	//-----------------
-
 	//Try to set the window size to a nice size
 	SetSize(getNiceWindowSize());
 
@@ -742,8 +736,6 @@
 
 
 
-	updateTimer->Start(UPDATE_TIMER_DELAY,wxTIMER_CONTINUOUS);
-	autoSaveTimer->Start(AUTOSAVE_DELAY*1000,wxTIMER_CONTINUOUS);
 
 #ifndef DISABLE_ONLINE_UPDATE
         wxDateTime datetime = wxDateTime::Today();	
@@ -808,6 +800,12 @@
 }
 
 
+void MainWindowFrame::finaliseStartup()
+{
+	updateTimer->Start(UPDATE_TIMER_DELAY,wxTIMER_CONTINUOUS);
+	autoSaveTimer->Start(AUTOSAVE_DELAY*1000,wxTIMER_CONTINUOUS);
+}
+
 BEGIN_EVENT_TABLE(MainWindowFrame, wxFrame)
     EVT_GRID_CMD_EDITOR_SHOWN(ID_GRID_FILTER_PROPERTY,MainWindowFrame::OnFilterGridCellEditorShow)
     EVT_GRID_CMD_EDITOR_HIDDEN(ID_GRID_FILTER_PROPERTY,MainWindowFrame::OnFilterGridCellEditorHide)
@@ -5376,6 +5374,16 @@
 		visControl.setIonDisplayLimit(configFile.getMaxPoints());
 	}
 
+	
+	if(configFile.getWantStartupOrthoCam())
+	{
+		visControl.setCamProperties(visControl.getActiveCamId(), 
+					CAMERA_KEY_LOOKAT_PROJECTIONMODE,TRANS("Orthogonal"));
+	}
+}
+
+void MainWindowFrame::checkShowTips()
+{
 	//Show startup tip dialog as needed
 	if(configFile.wantStartupTips())
 	{
@@ -5402,12 +5410,6 @@
 			WARN(false,"Tip file not found at startup, but user wanted it...");
 		}
 	}
-	
-	if(configFile.getWantStartupOrthoCam())
-	{
-		visControl.setCamProperties(visControl.getActiveCamId(), 
-					CAMERA_KEY_LOOKAT_PROJECTIONMODE,TRANS("Orthogonal"));
-	}
 }
 
 void MainWindowFrame::restoreConfigPanelDefaults()
Index: 3depict-0.0.16/src/gui/mainFrame.h
===================================================================
--- 3depict-0.0.16.orig/src/gui/mainFrame.h	2014-06-03 04:15:59.421246388 +0200
+++ 3depict-0.0.16/src/gui/mainFrame.h	2014-06-03 04:16:03.693192682 +0200
@@ -382,6 +382,10 @@
     //return type of file, based upon heuristic check
     static unsigned int guessFileType(const std::string &file);
 
+
+    //Check to see if the user wants a tip file
+    void checkShowTips();
+
     //See if the user wants to save the current state
     void checkAskSaveState();
     
@@ -397,6 +401,8 @@
     void onPanelSpectraUpdate() {plotUpdates=true;} ;
 
     bool initOK() const {return initedOK;}
+    
+    void finaliseStartup();
 
     //This is isolated from the layout code, due to "bug" 4815 in wx. The splitter window
     //does not know how to choose a good size until the window is shown
