From e30c653ee5bea23fbc52739dfc4f32b4a727bd19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Mon, 5 Mar 2012 13:23:44 +0000
Subject: [PATCH] Make sure windowsstates file exists before using it

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@14013 383ad7c9-94d9-4d36-a494-682f7c89f535
---
 Core/Core.cc           | 40 +++++++++++++++++++++++++---------------
 Core/optionHandling.cc |  2 +-
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/Core/Core.cc b/Core/Core.cc
index 2a1758d8..3acf64b1 100644
--- a/Core/Core.cc
+++ b/Core/Core.cc
@@ -581,26 +581,36 @@ Core::init() {
 
   if ( OpenFlipper::Options::gui() ) {
 
-    QSettings windowStates(OpenFlipper::Options::configDirStr()  + OpenFlipper::Options::dirSeparator() + "WindowStates.dat", QSettings::IniFormat);
+    QFile statesFile(OpenFlipper::Options::configDirStr()  + OpenFlipper::Options::dirSeparator() + "WindowStates.dat");
 
-    //try to restore the windowState
-    coreWidget_->restoreState (windowStates.value("Core/Window/State").toByteArray ());
-    //try to restore the geometry
-    coreWidget_->restoreGeometry (windowStates.value("Core/Window/Geometry").toByteArray ());
+    if (statesFile.exists() ) {
+      QSettings windowStates(OpenFlipper::Options::configDirStr()  + OpenFlipper::Options::dirSeparator() + "WindowStates.dat", QSettings::IniFormat);
 
-    coreWidget_->toolSplitter_->restoreState (windowStates.value("Core/ToolSplitter").toByteArray ());
-    coreWidget_->splitter_->restoreState (windowStates.value("Core/LogSplitter").toByteArray ());
+      //try to restore the windowState
+      coreWidget_->restoreState (windowStates.value("Core/Window/State").toByteArray ());
+      //try to restore the geometry
+      coreWidget_->restoreGeometry (windowStates.value("Core/Window/Geometry").toByteArray ());
 
-    coreWidget_->show();
+      coreWidget_->toolSplitter_->restoreState (windowStates.value("Core/ToolSplitter").toByteArray ());
+      coreWidget_->splitter_->restoreState (windowStates.value("Core/LogSplitter").toByteArray ());
 
-    applyOptions();
+      coreWidget_->show();
 
-    windowStates.beginGroup ("Core");
-    windowStates.beginGroup ("LogSlider");
-    coreWidget_->slidingLogger_->restoreState (windowStates);
-    windowStates.endGroup ();
-    coreWidget_->toolBox_->restoreState (windowStates);
-    windowStates.endGroup ();
+      applyOptions();
+
+      windowStates.beginGroup ("Core");
+      windowStates.beginGroup ("LogSlider");
+      coreWidget_->slidingLogger_->restoreState (windowStates);
+      windowStates.endGroup ();
+      coreWidget_->toolBox_->restoreState (windowStates);
+      windowStates.endGroup ();
+
+    } else {
+
+      coreWidget_->show();
+      applyOptions();
+
+    }
 
     if ( OpenFlipperSettings().value("Core/Gui/splash",true).toBool() ) {
       splash_->finish(coreWidget_);
diff --git a/Core/optionHandling.cc b/Core/optionHandling.cc
index 244ad003..74595b2f 100644
--- a/Core/optionHandling.cc
+++ b/Core/optionHandling.cc
@@ -194,7 +194,7 @@ void Core::setupOptions() {
   if ( localIni.exists() )
     optionFiles.push_back(OpenFlipper::Options::configDirStr() + OpenFlipper::Options::dirSeparator() + "OpenFlipper.ini");
 
-  // Set the previously generated Optionfiles
+  // Set the previously generated option files
   OpenFlipper::Options::optionFiles(optionFiles);
 
   // ==============================================================
-- 
GitLab