[kde-baseapps/KDE/4.14] konqueror/src: Unbreak session management: don't clear this window (for reusing) while saving.

[Albert Astals Cid]

Yes i did include it in 4.14.3

Cheers,
  Albert

El Dimarts, 11 de novembre de 2014, a les 11:22:41, David Faure va escriure:
> Git commit dcc45ea70b0b408c8017c6f423b978fe6ca6163a by David Faure.
> Committed on 11/11/2014 at 11:17.
> Pushed by dfaure into branch 'KDE/4.14'.
> 
> Unbreak session management: don't clear this window (for reusing) while
> saving.
> 
> BUG: 339699
> FIXED-IN: 4.14.4
> 
> (maybe this can be added to 4.14.3?)
> CCMAIL: release-team at kde.org
> 
> M  +1    -1    konqueror/src/konqmainwindow.cpp
> 
> http://commits.kde.org/kde-baseapps/dcc45ea70b0b408c8017c6f423b978fe6ca6163a
> 
> diff --git a/konqueror/src/konqmainwindow.cpp
> b/konqueror/src/konqmainwindow.cpp index 8f274c3..f19cddb 100644
> --- a/konqueror/src/konqmainwindow.cpp
> +++ b/konqueror/src/konqmainwindow.cpp
> @@ -5190,7 +5190,7 @@ void KonqMainWindow::closeEvent( QCloseEvent *e )
>            QApplication::sendEvent( (*it)->part()->widget(), e );
>    }
>    KParts::MainWindow::closeEvent( e );
> -  if (stayPreloaded() && !kapp->sessionSaving()) {
> +  if (!kapp->sessionSaving() && stayPreloaded()) {
>        e->ignore();
>        hide();
>    }
> _______________________________________________
> release-team mailing list
> release-team at kde.org
> https://mail.kde.org/mailman/listinfo/release-team