diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-09 11:02:10 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-09 11:02:10 +0000 |
| commit | a40cb0162028c553032407ec3bd553dcbcd2f3ba (patch) | |
| tree | b35f6bfcdaf4014efff32c68730daf8a2889705c | |
| parent | Shortcuts: remove default.xml from repo to resolve any confusion on what file... (diff) | |
| download | inkscape-a40cb0162028c553032407ec3bd553dcbcd2f3ba.tar.gz inkscape-a40cb0162028c553032407ec3bd553dcbcd2f3ba.zip | |
Shortcuts: Fix for 7d248fbba5b0c24d9a24cda8c3f2e79f96395553 (is_user_set was not properly set anymore)
| -rw-r--r-- | src/shortcuts.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp index c5ec7ed50..52248b81f 100644 --- a/src/shortcuts.cpp +++ b/src/shortcuts.cpp @@ -50,7 +50,7 @@ using namespace Inkscape; using namespace Inkscape::IO::Resource; -static bool try_shortcuts_file(char const *filename); +static bool try_shortcuts_file(char const *filename, bool const is_user_set=false); static void read_shortcuts_file(char const *filename, bool const is_user_set=false); unsigned int sp_shortcut_get_key(unsigned int const shortcut); @@ -107,15 +107,15 @@ void sp_shortcut_init() } // load shortcuts adjusted by user - try_shortcuts_file(get_path(USER, KEYS, "default.xml")); + try_shortcuts_file(get_path(USER, KEYS, "default.xml"), true); } -static bool try_shortcuts_file(char const *filename) { +static bool try_shortcuts_file(char const *filename, bool const is_user_set) { using Inkscape::IO::file_test; /* ah, if only we had an exception to catch... (permission, forgiveness) */ if (file_test(filename, G_FILE_TEST_EXISTS)) { - read_shortcuts_file(filename, true); + read_shortcuts_file(filename, is_user_set); return true; } |