From 84ffcf5a644085f79ad86f0d23421c97c1b3f063 Mon Sep 17 00:00:00 2001 From: gballintijn Date: Sun, 12 Apr 2009 12:48:42 +0000 Subject: [PATCH] Fixed double initialitation of the field state_ in InputDevice. git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2359 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/src/synfigapp/inputdevice.cpp | 25 +---------------------- 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/synfig-studio/trunk/src/synfigapp/inputdevice.cpp b/synfig-studio/trunk/src/synfigapp/inputdevice.cpp index 4a513a6..f575469 100644 --- a/synfig-studio/trunk/src/synfigapp/inputdevice.cpp +++ b/synfig-studio/trunk/src/synfigapp/inputdevice.cpp @@ -160,36 +160,13 @@ public: InputDevice::InputDevice(const synfig::String id_, Type type_): id_(id_), type_(type_), - state_((type_==TYPE_PEN)?"sketch":"normal"), + state_((type_==TYPE_PEN)?"draw":"normal"), foreground_color_(Color::black()), background_color_(Color::white()), bline_width_(Distance(1,Distance::SYSTEM_POINTS)), opacity_(1.0f), blend_method_(Color::BLEND_COMPOSITE) { - switch(type_) - { - case TYPE_MOUSE: - state_="normal"; - break; - - case TYPE_PEN: - state_="draw"; - break; - - case TYPE_ERASER: - state_="normal"; - break; - - case TYPE_CURSOR: - state_="normal"; - break; - - default: - state_="normal"; - break; - } - device_settings=new DeviceSettings(this); Main::settings().add_domain(device_settings,"input_device."+id_); } -- 2.7.4