[niepce] Do not crash if no library is created.



commit 5a89c4b0caa7c61c7515e9a455d85c2e43ba3b8f
Author: Hub Figuiere <hub figuiere net>
Date:   Fri Oct 28 21:21:18 2011 -0700

    Do not crash if no library is created.

 src/niepce/ui/niepcewindow.cpp        |    4 +++-
 src/niepce/ui/workspacecontroller.cpp |    8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/src/niepce/ui/niepcewindow.cpp b/src/niepce/ui/niepcewindow.cpp
index e24a025..368b98c 100644
--- a/src/niepce/ui/niepcewindow.cpp
+++ b/src/niepce/ui/niepcewindow.cpp
@@ -354,7 +354,9 @@ void NiepceWindow::on_open_library()
     else {
         DBG_OUT("last library is %s", libMoniker.c_str());
     }
-    open_library(libMoniker);
+    if(!libMoniker.empty()) {
+        open_library(libMoniker);
+    }
 }
 
 
diff --git a/src/niepce/ui/workspacecontroller.cpp b/src/niepce/ui/workspacecontroller.cpp
index c84cbc3..9922fc2 100644
--- a/src/niepce/ui/workspacecontroller.cpp
+++ b/src/niepce/ui/workspacecontroller.cpp
@@ -227,8 +227,12 @@ namespace ui {
 	
 	void WorkspaceController::on_ready()
 	{
-		getLibraryClient()->getAllFolders();
-		getLibraryClient()->getAllKeywords();
+	    libraryclient::LibraryClient::Ptr libraryClient = getLibraryClient();
+	    if(libraryClient)
+	    {
+		libraryClient->getAllFolders();
+		libraryClient->getAllKeywords();
+	    }
 	}
 
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]