diff options
| author | Patrick Storz <eduard.braun2@gmx.de> | 2019-06-07 22:27:29 +0000 |
|---|---|---|
| committer | Patrick Storz <eduard.braun2@gmx.de> | 2019-06-07 22:28:13 +0000 |
| commit | 96c7da471a5a3c771714f78db87c357873d64816 (patch) | |
| tree | 01210fd886781d10d7598f82674c4c5da65d8576 /src/inkscape.h | |
| parent | TextToolbar: Fix superscript/subscript handling (diff) | |
| download | inkscape-96c7da471a5a3c771714f78db87c357873d64816.tar.gz inkscape-96c7da471a5a3c771714f78db87c357873d64816.zip | |
Remove _argv0 from Inkscape::Application
Currently it was only used as the least preferred (and therefore
effectively unused) location where to store the crash backup.
However it wasn't set properly since
408cb49b5559a81ea803df64bf58457a5dd4bf16
causing assertion errors while crashing.
On top of that argv0 is not a reliable way to determine the path to
the currently running executable anyway.
Fixes https://gitlab.com/inkscape/inkscape/issues/176
Diffstat (limited to 'src/inkscape.h')
| -rw-r--r-- | src/inkscape.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/inkscape.h b/src/inkscape.h index 840620171..d14420352 100644 --- a/src/inkscape.h +++ b/src/inkscape.h @@ -76,7 +76,7 @@ class Application { public: static Application& instance(); static bool exists(); - static void create(const char* argv0, bool use_gui); + static void create(bool use_gui); // returns the mask of the keyboard modifier to map to Alt, zero if no mapping // Needs to be a guint because gdktypes.h does not define a 'no-modifier' value @@ -91,15 +91,12 @@ public: bool use_gui() const { return _use_gui; } void use_gui(gboolean guival) { _use_gui = guival; } - char const* argv0() const { return _argv0; } - void argv0(char const *); - // no setter for this -- only we can control this variable static bool isCrashing() { return _crashIsHappening; } // useful functions void autosave_init(); - void application_init (const gchar *argv0, gboolean use_gui); + void application_init (gboolean use_gui); void load_config (const gchar *filename, Inkscape::XML::Document *config, const gchar *skeleton, unsigned int skel_size, const gchar *e_notreg, const gchar *e_notxml, const gchar *e_notsp, const gchar *warn); @@ -212,7 +209,7 @@ public: private: static Inkscape::Application * _S_inst; - Application(const char* argv0, bool use_gui); + Application(bool use_gui); ~Application(); Application(Application const&); // no copy @@ -228,7 +225,6 @@ public: bool _dialogs_toggle; guint _mapalt; guint _trackalt; - char * _argv0; static bool _crashIsHappening; bool _use_gui; gint _pdf_page; |
