summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Thurman <tthurman@gnome.org>2008-10-26 17:25:42 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2008-10-26 17:25:42 +0000
commitd819b99d99961d8e952e2b1d59ea27e0c97d3baa (patch)
tree92b132e4612a33b11854fb6373e1759a22903205 /src
parent8201b0361a8127111945ee96e50bfbd29d6410b6 (diff)
downloadmetacity-d819b99d99961d8e952e2b1d59ea27e0c97d3baa.tar.gz
Ignore values of .../mouse_button_modifier key if the key's missing.
2008-10-26 Thomas Thurman <tthurman@gnome.org> * src/core/prefs.c (mouse_button_mods_handler): Ignore values of .../mouse_button_modifier key if the key's missing. Closes Launchpad bug #258054, Launchpad bug #266929. svn path=/trunk/; revision=4001
Diffstat (limited to 'src')
-rw-r--r--src/core/prefs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/prefs.c b/src/core/prefs.c
index ab82c988..267eb47b 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -1381,7 +1381,7 @@ mouse_button_mods_handler (MetaPreference pref,
meta_topic (META_DEBUG_KEYBINDINGS,
"Mouse button modifier has new gconf value \"%s\"\n",
string_value);
- if (meta_ui_parse_modifier (string_value, &mods))
+ if (string_value && meta_ui_parse_modifier (string_value, &mods))
{
mouse_button_mods = mods;
}