Changeset 25 for trunk/src/MainPter.cxx

Timestamp:

04/11/06 11:16:59 (3 years ago)

Author:

jordi

Message:

It's now possible to cancel the open file dialog :-)

Files:

• trunk/src/MainPter.cxx (modified) (1 diff)

trunk/src/MainPter.cxx

@@ -142 +142 @@
     IMainView &view = getView ();
     gchar *fileName = view.openFileDialog ();
-    GError *error;
-    if ( m_Document->loadFile (fileName, NULL, &error) )
+    // if openFileDialog returns NULL, then the user cancelled the operation.
+    // I don't need to do anything in this case. I'm only interested when
+    // the user tried to open a file.
+    if ( NULL != fileName )
     {
-        // Now that the document has been loaded, just reset the initial
-        // state.
-        setInitialState ();
-        g_free (fileName);
+        GError *error;
+        if ( m_Document->loadFile (fileName, NULL, &error) )
+        {
+            // Now that the document has been loaded, just reset the initial
+            // state.
+            setInitialState ();
+            g_free (fileName);
+        }
     }
 }