summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2019-08-01 09:16:36 -0700
committerMarcus Müller <marcus@hostalia.de>2019-08-05 16:09:38 +0200
commit5601b735ada0c3e784a8eaec2d0f3f532a5a264a (patch)
treeb5ab8296e833fb6510a4744a69e294415ba10470
parent595f575588d19362c6d87b4e74b053de98e388da (diff)
uhd: Skip restoreGeometry() when no previous settings exist
There are cases when the Qt-based apps in gr-uhd would crash because Qt would try and load previous geometry settings which didn't exist. This disables applying previous geometry if the setting is empty.
-rwxr-xr-xgr-uhd/apps/uhd_fft4
-rwxr-xr-xgr-uhd/apps/uhd_siggen_gui4
2 files changed, 6 insertions, 2 deletions
diff --git a/gr-uhd/apps/uhd_fft b/gr-uhd/apps/uhd_fft
index 09ab82e59c..eab9155df0 100755
--- a/gr-uhd/apps/uhd_fft
+++ b/gr-uhd/apps/uhd_fft
@@ -82,7 +82,9 @@ class uhd_fft(UHDApp, gr.top_block, Qt.QWidget):
self.top_grid_layout = Qt.QGridLayout()
self.top_layout.addLayout(self.top_grid_layout)
self.settings = Qt.QSettings("GNU Radio", "uhd_fft")
- self.restoreGeometry(self.settings.value("geometry"))
+ geo_settings = self.settings.value("geometry")
+ if geo_settings:
+ self.restoreGeometry(self.settings.value("geometry"))
##################################################
# Parameters
diff --git a/gr-uhd/apps/uhd_siggen_gui b/gr-uhd/apps/uhd_siggen_gui
index 422a6146c4..48a14df81a 100755
--- a/gr-uhd/apps/uhd_siggen_gui
+++ b/gr-uhd/apps/uhd_siggen_gui
@@ -85,7 +85,9 @@ class uhd_siggen_gui(Qt.QWidget):
self.top_grid_layout = Qt.QGridLayout()
self.top_layout.addLayout(self.top_grid_layout)
self.settings = Qt.QSettings("GNU Radio", "uhd_siggen_gui")
- self.restoreGeometry(self.settings.value("geometry"))
+ geo_settings = self.settings.value("geometry")
+ if geo_settings:
+ self.restoreGeometry(self.settings.value("geometry"))
##################################################
# Widgets + Controls