From 42e03ce9bf6ec9d4c7f1c19c10a14c886dbd7427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20J=2EV=2E=20Bertin?= Date: Fri, 22 May 2015 01:47:16 +0200 Subject: [PATCH] Initialise PageViewPrivate::aFitWindowToPage to NULL and check against NULL consistently before calling aFitWindowToPage->setEnabled(). BUG: 348000 REVIEW: 123876 --- ui/pageview.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/pageview.cpp b/ui/pageview.cpp index b57e6aef4..5e7fc2917 100644 --- a/ui/pageview.cpp +++ b/ui/pageview.cpp @@ -331,6 +331,7 @@ PageView::PageView( QWidget *parent, Okular::Document *document ) d->mouseModeActionGroup = 0; d->penDown = false; d->aMouseMagnifier = 0; + d->aFitWindowToPage = 0; switch( Okular::Settings::zoomMode() ) { @@ -4135,7 +4136,8 @@ void PageView::slotRelayoutPages() const int nCols = overrideCentering ? 1 : viewColumns(); const bool singlePageViewMode = Okular::Settings::viewMode() == Okular::Settings::EnumViewMode::Single; - d->aFitWindowToPage->setEnabled( !continuousView && singlePageViewMode ); + if ( d->aFitWindowToPage ) + d->aFitWindowToPage->setEnabled( !continuousView && singlePageViewMode ); // set all items geometry and resize contents. handle 'continuous' and 'single' modes separately