Commit 930d0323 authored by Max Lyon's avatar Max Lyon

Fixed several problems with uninitialized propertyModel_ in property viz...

Fixed several problems with uninitialized propertyModel_ in property viz plugin, such as the crash in slotAllCleared.
refs #1269

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@15834 383ad7c9-94d9-4d36-a494-682f7c89f535
parent a4a142c1
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
#include <OpenFlipper/BasePlugin/PluginFunctions.hh> #include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <ACG/Utils/ColorCoder.hh> #include <ACG/Utils/ColorCoder.hh>
#include "PropertyModelFactory.hh"
//== IMPLEMENTATION ========================================================== //== IMPLEMENTATION ==========================================================
...@@ -109,6 +110,8 @@ void PropertyVisPlugin::pluginsInitialized() ...@@ -109,6 +110,8 @@ void PropertyVisPlugin::pluginsInitialized()
connect(tool_->remove_property_tb, SIGNAL( clicked() ), this, SLOT( slotRemoveProperty() ) ); connect(tool_->remove_property_tb, SIGNAL( clicked() ), this, SLOT( slotRemoveProperty() ) );
connect(tool_, SIGNAL( widgetShown() ), this, SLOT( updateGUI() ) ); connect(tool_, SIGNAL( widgetShown() ), this, SLOT( updateGUI() ) );
setNewPropertyModel(-1); //to avoid problems with uninitialized propertyModel_ it is set to a dummy property model without functionality
} }
} }
......
...@@ -73,7 +73,6 @@ ...@@ -73,7 +73,6 @@
#include "ObjectListItemModel.hh" #include "ObjectListItemModel.hh"
#include "PropertyModel.hh" #include "PropertyModel.hh"
#include "PropertyModelFactory.hh"
//== CLASS DEFINITION ========================================================= //== CLASS DEFINITION =========================================================
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment