Changeset 157

Timestamp:

01/10/10 10:58:27 (2 years ago)

Author:

stefan

Message:

fixed bug #169: exception is thrown when starting recording without selected program

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• src/org/jergometer/Jergometer.java (modified) (2 diffs)

trunk/CHANGELOG

@@ -6 +6 @@
 2010-01-10
 * [stefan]  * done enhancement #156: replace buttons with nicer ones
+            * fixed bug #169: exception is thrown when starting recording without selected program
 
 == 0.7.3 ==

trunk/src/org/jergometer/Jergometer.java

@@ -334 +334 @@
   public void startRecording() {
     if (!recording) {
+      if (program == null) {
+        JOptionPane.showMessageDialog(mainWindow, I18n.getString("msg.choose_a_program"));
+        return;
+      }
+
       // clear diagram and draw the bike program
       selectBikeProgram(program);
@@ -360 +365 @@
         e.printStackTrace();
         JOptionPane.showMessageDialog(mainWindow, I18n.getString("msg.connection_failed"), I18n.getString("error_dialog.title"), JOptionPane.ERROR_MESSAGE);
-        return;
-      }
-
-      if (program == null) {
-        JOptionPane.showMessageDialog(mainWindow, I18n.getString("msg.choose_a_program"));
         return;
       }