license: remove FSF postal address from boiler plate license text

[sigrok-meter.git] / sigrok-meter

diff --git a/sigrok-meter b/sigrok-meter
index c991fad0e5fdf3dfddac710d0e557ead8b641a4b..b2f60070d5442d284d76a58aa74b814599e458f6 100755 (executable)
--- a/sigrok-meter
+++ b/sigrok-meter
@@ -16,12 +16,10 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+## along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 
 import argparse
-import sigrok.core as sr
 import sys
 import textwrap
 import signal
@@ -95,10 +93,16 @@ if __name__ == '__main__':
     qtcompat.load_modules(args.pyside)
     QtCore = qtcompat.QtCore
     QtGui = qtcompat.QtGui
-    import mainwindow
 
     app = QtGui.QApplication([])
 
+    try:
+        import sigrok.core as sr
+    except Exception as e:
+        QtGui.QMessageBox.critical(None, 'Error starting sigrok-meter',
+           'Unable to use the sigrok Python bindings:\n{}.'.format(e))
+        sys.exit(1)
+
     # Initialize modules that need a QApplication to exist.
     import settings
     settings.init()
@@ -114,6 +118,7 @@ if __name__ == '__main__':
         except:
             sys.exit('Error: invalid log level.')
 
+    import mainwindow
     s = mainwindow.MainWindow(context, args.drivers)
     s.show()