[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 08/09: qtgui: tolerate return of NoneType w
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 08/09: qtgui: tolerate return of NoneType when setting not found |
Date: |
Wed, 22 Jun 2016 21:19:32 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next-qt5
in repository gnuradio.
commit a63f6c6fe0b1e28d1ad614a8640b73dab991f92d
Author: Johnathan Corgan <address@hidden>
Date: Wed Jun 22 13:46:19 2016 -0700
qtgui: tolerate return of NoneType when setting not found
---
grc/core/generator/flow_graph.tmpl | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/grc/core/generator/flow_graph.tmpl
b/grc/core/generator/flow_graph.tmpl
index d296783..4b275c0 100644
--- a/grc/core/generator/flow_graph.tmpl
+++ b/grc/core/generator/flow_graph.tmpl
@@ -121,10 +121,13 @@ class $(class_name)(gr.top_block, Qt.QWidget):
self.settings = Qt.QSettings("GNU Radio", "$class_name")
- if StrictVersion(Qt.qVersion()) < StrictVersion("5.0.0"):
- self.restoreGeometry(self.settings.value("geometry").toByteArray())
- else:
- self.restoreGeometry(self.settings.value("geometry"))
+ try:
+ if StrictVersion(Qt.qVersion()) < StrictVersion("5.0.0"):
+
self.restoreGeometry(self.settings.value("geometry").toByteArray())
+ else:
+ self.restoreGeometry(self.settings.value("geometry"))
+ except:
+ pass
#elif $generate_options == 'no_gui'
- [Commit-gnuradio] [gnuradio] branch next-qt5 updated (3c14957 -> cc57ff6), git, 2016/06/22
- [Commit-gnuradio] [gnuradio] 03/09: cmake: FindQwt: Find the Qwt library that matches the Qt version, git, 2016/06/22
- [Commit-gnuradio] [gnuradio] 05/09: gr-qtgui: Fix range.py to work with both Qt4 and Qt5, git, 2016/06/22
- [Commit-gnuradio] [gnuradio] 09/09: Merge branch 'adi-qt5' into next-qt5, git, 2016/06/22
- [Commit-gnuradio] [gnuradio] 06/09: gr-qtgui: Re-introduce some Qt4-specific code, git, 2016/06/22
- [Commit-gnuradio] [gnuradio] 07/09: grc: Fix generation of Python code for Qt4 and Qt5, git, 2016/06/22
- [Commit-gnuradio] [gnuradio] 01/09: Revert "CMake: Remove obsolete GrSetupQt4 module", git, 2016/06/22
- [Commit-gnuradio] [gnuradio] 04/09: gr-qtgui: Fix PyQt[4, 5] include in XMLs for GRC, git, 2016/06/22
- [Commit-gnuradio] [gnuradio] 08/09: qtgui: tolerate return of NoneType when setting not found,
git <=
- [Commit-gnuradio] [gnuradio] 02/09: gr-qtgui: Allow build with Qt4 or Qt5 (default), git, 2016/06/22