Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

[qtmeetings] / src / UserInterface / WindowManager.cpp

diff --git a/src/UserInterface/WindowManager.cpp b/src/UserInterface/WindowManager.cpp
index 924392e..feef534 100644 (file)
--- a/src/UserInterface/WindowManager.cpp
+++ b/src/UserInterface/WindowManager.cpp
@@ -88,7 +88,7 @@ void WindowManager::roomStatusChanged( Room *aRoom, Room::Status aStatus, QTime
 void WindowManager::showRoomStatus()
 {
        qDebug() << "WindowManager::showRoomStatus";
-
+       iWeeklyView->setDefaultRoom();
        if ( iRoomStatusView == 0 )
        {
                emit roomStatusInfoNeeded( iWeeklyView->currentRoom() );
@@ -190,7 +190,8 @@ void WindowManager::showProgressBar( const QString &aText, bool aCancellable )
                iProgressBar = new ProgressBar( aText, aCancellable );
                iProgressBar->setFixedSize( 600, 125 );
                iProgressBar->show();
-               connect( iProgressBar, SIGNAL( cancel() ), this, SIGNAL( progressBarCancelled() ) );
+               if( aCancellable )
+                       connect( iProgressBar, SIGNAL( cancel() ), this, SIGNAL( progressBarCancelled() ) );
        }
        
        //TODO connect connect( iWeeklyView, SIGNAL( observedEventDetected() ), this, SIGNAL( observedEventDetected() ) );