[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/step/step
From:       Johannes Simon <johannes.simon () gmail ! com>
Date:       2010-11-07 20:44:21
Message-ID: 20101107204421.3E285AC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1193999 by jsimon:

Backport fix from 5.3 branch: Do not crash when creating an item

 M  +5 -1      worldscene.cc  


--- trunk/KDE/kdeedu/step/step/worldscene.cc #1193998:1193999
@@ -208,7 +208,11 @@
         bool handled = _itemCreator->sceneEvent(event);
         if(_itemCreator->finished()) {
             emit endAddItem(_itemCreator->className(), _itemCreator->item() != NULL);
-            delete _itemCreator; _itemCreator = NULL;
+            // ~ItemCreator() will indirectly call this method, thus we must set
+            // the pointer to NULL before deleting the ItemCreator.
+            ItemCreator* itemCreator = _itemCreator;
+            _itemCreator = NULL;
+            delete itemCreator;
         }
         if(handled) {
             event->accept();
[prev in list] [next in list] [prev in thread] [next in thread]