Changeset 101:7234b7fabd05 in glemon-0.x

Timestamp:

12/19/05 17:59:05 (18 years ago)

Author:

Akos Ladanyi

Branch:

gui

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk/gui@2441

Message:

Fix crash when the input file does not contain any nodeset or edgeset.

File:

• mapstorage.cc (modified) (2 diffs)

mapstorage.cc

@@ -213 +213 @@
     lreader.run();
 
+    if (content.nodeSetNum() < 1)
+    {
+      Gtk::MessageDialog mdialog("No nodeset found in file.");
+      mdialog.run();
+      clear();
+      return 1;
+    }
+
+    if (content.edgeSetNum() < 1)
+    {
+      Gtk::MessageDialog mdialog("No edgeset found in file.");
+      mdialog.run();
+      clear();
+      return 1;
+    }
+
     const std::vector<std::string>& nodeMapNames = content.nodeSetMaps(0);
     const std::vector<std::string>& edgeMapNames = content.edgeSetMaps(0);
@@ -257 +273 @@
     GuiReader gui_reader(greader, this);
     greader.run();
-  } catch (DataFormatError& error) {
+  } catch (Exception& error) {
     Gtk::MessageDialog mdialog(error.what());
     mdialog.run();