From 4c09a4b1b415d78ad5107d2990fa75f0bec31c43 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Mon, 4 Jan 2016 20:13:59 +0100 Subject: [PATCH] src/gui/infoviewer.cpp try to fix segfault after PB change Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/9aa1420ca7d1b05f9fc3ef6ab13b63711e402e3f Author: Jacek Jendrzej Date: 2016-01-04 (Mon, 04 Jan 2016) Origin message was: ------------------ src/gui/infoviewer.cpp try to fix segfault after PB change ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/infoviewer.cpp | 6 ++++++ src/gui/infoviewer_bb.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 81a4970ce..1327af558 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -122,6 +122,9 @@ CInfoViewer::CInfoViewer () oldinfo.current_uniqueKey = 0; oldinfo.next_uniqueKey = 0; isVolscale = false; + info_time_width = 0; + timeoutEnd = 0; + sec_timer_id = 0; } CInfoViewer::~CInfoViewer() @@ -644,7 +647,10 @@ void CInfoViewer::reset_allScala() { changePB(); lastsig = lastsnr = -1; + infoViewerBB->changePB(); infoViewerBB->reset_allScala(); + if(!clock) + initClock(); } void CInfoViewer::check_channellogo_ca_SettingsChange() diff --git a/src/gui/infoviewer_bb.h b/src/gui/infoviewer_bb.h index 360898a21..4a7944028 100644 --- a/src/gui/infoviewer_bb.h +++ b/src/gui/infoviewer_bb.h @@ -118,7 +118,6 @@ class CInfoViewerBB void paint_ca_icons(int, const char*, int&); void paintCA_bar(int,int); void showOne_CAIcon(); - void changePB(void); static void* scrambledThread(void *arg); void scrambledCheck(bool force=false); @@ -153,6 +152,7 @@ class CInfoViewerBB CComponentsShapeSquare* getFooter(void){return foot;} CComponentsShapeSquare* getCABar(void){return cabar;} void ResetModules(void); + void changePB(void); }; #endif // __infoview_bb__