diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index ae52589046ec1c34b5dbc2db3b156f4665fdc5a6..b497367cc999714f4283782aa93782a4bb57c3b7 100644 (file)
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
new (&inkscape->document_set) std::map<SPDocument *, int>();
inkscape->menus = sp_repr_read_mem (_(menus_skeleton), MENUS_SKELETON_SIZE, NULL);
-
inkscape->desktops = NULL;
-
inkscape->dialogs_toggle = TRUE;
-
inkscape->mapalt=GDK_MOD1_MASK;
}
}
}
- Inkscape::Preferences::unload();
+ // do not save the preferences since they can be in a corrupted state
+ Inkscape::Preferences::unload(false);
fprintf (stderr, "Emergency save completed. Inkscape will close now.\n");
fprintf (stderr, "If you can reproduce this crash, please file a bug at www.inkscape.org\n");
inkscape->use_gui = use_gui;
inkscape->argv0 = g_strdup(argv0);
- /* Load the preferences and menus; Later menu layout should be merged into prefs */
+ /* Load the preferences and menus */
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
prefs->load(use_gui, false);
inkscape_load_menus(inkscape);
}
}
-
-
/*
Local Variables:
mode:c++