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

List:       kde-commits
Subject:    [Konversation] 27aca92: Fix bug 83521,
From:       Peter Simonsson <peter.simonsson () gmail ! com>
Date:       2010-07-01 13:27:32
Message-ID: 20100701132732.B2222BB563A () projects ! kde ! org
[Download RAW message or body]

commit 27aca925c3a44e5a6e0df0c455e58de6cde8546d
Author: Peter Simonsson <peter.simonsson@gmail.com>
Date:   Thu Jun 17 08:24:06 2004 +0000

    Fix bug 83521, crash when closing nonfocused server tab
    Thx Eli MacKenzie <argonel@sympatico.ca> for the patch
    
    CCMAIL: 83521-close@bugs.kde.org
    
    svn path=/trunk/kdeextragear-2/konversation/; revision=321371

diff --git a/konversation/konversationmainwindow.cpp b/konversation/konversationmainwindow.cpp
index 178434d..72e2bf7 100644
--- a/konversation/konversationmainwindow.cpp
+++ b/konversation/konversationmainwindow.cpp
@@ -240,7 +240,7 @@ void KonversationMainWindow::appendToFrontmost(const QString& type,const QString
   // TODO: Make it an option to direct all status stuff into the status panel
 
   updateFrontView();
-  if(frontView==0 ||              // Check if the frontView can actually display text or ...
+  if(!frontView ||              // Check if the frontView can actually display text or ...
      serverView->getServer()!=frontView->getServer())  // if it does not belong to this server
   {
     // if not, take server specified fallback view instead
diff --git a/konversation/konversationmainwindow.h b/konversation/konversationmainwindow.h
index 0f3e7b7..889821a 100644
--- a/konversation/konversationmainwindow.h
+++ b/konversation/konversationmainwindow.h
@@ -156,7 +156,7 @@ class KonversationMainWindow : public KMainWindow
     LedTabWidget* viewContainer;
 
     Server* frontServer;
-    ChatWindow* frontView;
+    QGuardedPtr<ChatWindow> frontView;
     ChatWindow* searchView;
 
     UrlCatcher* urlCatcherPanel;
[prev in list] [next in list] [prev in thread] [next in thread]