From 14e71eccf3a54a056b74266d54ddb70a77528777 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sun, 24 Mar 2013 17:32:01 +0200 Subject: [PATCH] Guard against null pointers --- source/root.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/source/root.cpp b/source/root.cpp index 1dea150..1b47e8a 100644 --- a/source/root.cpp +++ b/source/root.cpp @@ -36,12 +36,19 @@ void Root::init() update_style(); - mouse->signal_button_press.connect(sigc::mem_fun(this, &Root::button_press_event)); - mouse->signal_button_release.connect(sigc::mem_fun(this, &Root::button_release_event)); - mouse->signal_axis_motion.connect(sigc::mem_fun(this, &Root::axis_motion_event)); - keyboard->signal_button_press.connect(sigc::mem_fun(this, &Root::key_press_event)); - keyboard->signal_button_release.connect(sigc::mem_fun(this, &Root::key_release_event)); - keyboard->signal_character.connect(sigc::mem_fun(this, &Root::character_event)); + if(mouse) + { + mouse->signal_button_press.connect(sigc::mem_fun(this, &Root::button_press_event)); + mouse->signal_button_release.connect(sigc::mem_fun(this, &Root::button_release_event)); + mouse->signal_axis_motion.connect(sigc::mem_fun(this, &Root::axis_motion_event)); + } + + if(keyboard) + { + keyboard->signal_button_press.connect(sigc::mem_fun(this, &Root::key_press_event)); + keyboard->signal_button_release.connect(sigc::mem_fun(this, &Root::key_release_event)); + keyboard->signal_character.connect(sigc::mem_fun(this, &Root::character_event)); + } } Root::~Root() -- 2.43.0