fix bug that gave inconsistent icons, plus caused crashes

3 files changed, 6 insertions, 27 deletions

diff --git a/BUGS b/BUGS
index f5a807b..6c0fa58 100644
--- a/BUGS
+++ b/BUGS
@@ -85,28 +85,3 @@ Fixed bugs (or not-our-fault bugs):
                     layer-wise (other transient flashes)
     => fixed
 
-------------------------------
-Core dumps and notes
-
-Simon, 19/7/03. 
-Dump on workspace change. Toolbarmode = workspace
-Interesting points:
-(gdb) p fluxboxwin->m_client
-$2 = (class WinClient *) 0x42424141
-==> the fluxboxwin is probably dead
-
-#5  0x401ab518 in sigaction () from /lib/libc.so.6
-#6  0x0806199d in basic_string<char, string_char_traits<char>, __default_alloc_template<true, 0> >::size (this=0x424241d5)
-    at /usr/lib/gcc-lib/i386-linux/2.95.4/../../../../include/g++-3/std/bastring.h:156
-#7  0x080aab44 in IconBar::draw (this=0x819e888, obj=0x81998e0, width=56)
-    at IconBar.cc:363
-#8  0x080aa842 in IconBar::exposeEvent (this=0x819e888, ee=0xbffff44c)
-    at IconBar.cc:265
-#9  0x080a4f23 in Toolbar::exposeEvent (this=0x8198cc8, ee=@0xbffff44c)
-    at Toolbar.cc:1095
-#10 0x080ac1ac in FbTk::EventManager::handleEvent (this=0x81406ec,
-    ev=@0xbffff44c) at EventManager.cc:71
-#11 0x0805a63c in Fluxbox::handleEvent (this=0x8142220, e=0xbffff44c)
-    at fluxbox.cc:740
-#12 0x08059a14 in Fluxbox::eventLoop (this=0x8142220) at fluxbox.cc:597
-
diff --git a/ChangeLog b/ChangeLog
index dd12f68..f0a4f21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 (Format: Year/Month/Day)
 Changes for 0.9.5:
+*03/07/25:
+   * Fix pesky crash and phantom icons (diesig wasn't getting through) (Simon)
+     ToolbarHandler.cc
 *03/07/24:
    * Fix some maximisation issues (Simon)
      Window.hh/cc FbCommandFactory.cc
diff --git a/src/ToolbarHandler.cc b/src/ToolbarHandler.cc
index 5db8f44..d5682e9 100644
--- a/src/ToolbarHandler.cc
+++ b/src/ToolbarHandler.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ToolbarHandler.cc,v 1.24 2003/07/20 02:45:57 rathnor Exp $
+// $Id: ToolbarHandler.cc,v 1.25 2003/07/25 08:46:51 rathnor Exp $
 
 /**
  * The ToolbarHandler class acts as a rough interface to the toolbar.
@@ -159,6 +159,7 @@ ToolbarHandler::ToolbarHandler(BScreen &screen)
     // (we only want it done once, so it can't go in initforscreen)
 
     screen.addConfigMenu("Toolbar", m_toolbarmenu);
+    enableUpdate();
 }
 
 void ToolbarHandler::setMode(ToolbarMode newmode, bool initialise) {
@@ -284,7 +285,7 @@ void ToolbarHandler::setupFrame(FluxboxWindow &win) {
     case NONE:
         break;
     case WORKSPACE:
-        if (win.workspaceNumber() == m_current_workspace)    
+        if (win.workspaceNumber() == m_current_workspace)
             m_toolbar->addIcon(&win);
         break;
     case WORKSPACEICONS: