Merge branch 'develop'

BlythMeister · Jun 9, 2014 · 229d9d1 · 229d9d1
2 parents b1d2c58 + 5947182
commit 229d9d1
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/src/Gallifrey.UI.Classic.Beta/Gallifrey.UI.Classic.Beta.csproj b/src/Gallifrey.UI.Classic.Beta/Gallifrey.UI.Classic.Beta.csproj
@@ -28,8 +28,8 @@
     <ProductName>Gallifrey %28Beta%29</ProductName>
     <PublisherName>Gallifrey</PublisherName>
     <MinimumRequiredVersion>1.0.0.0</MinimumRequiredVersion>
-    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>1.0.2.%2a</ApplicationVersion>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.3.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>

diff --git a/src/Gallifrey.UI.Classic/ExportTimerWindow.cs b/src/Gallifrey.UI.Classic/ExportTimerWindow.cs
@@ -65,7 +65,7 @@ private bool ExportTime()
         {
             int hours, minutes;
 
-            if (!int.TryParse(txtSetValueHours.Text, out hours) || !int.TryParse(txtSetValueMins.Text, out minutes))
+            if (!int.TryParse(txtExportHours.Text, out hours) || !int.TryParse(txtExportMins.Text, out minutes))
             {
                 MessageBox.Show("Invalid Hours/Minutes Entered For Export!", "Invalid Export", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return false;

diff --git a/src/Gallifrey.UI.Classic/Gallifrey.UI.Classic.csproj b/src/Gallifrey.UI.Classic/Gallifrey.UI.Classic.csproj
@@ -29,7 +29,7 @@
     <PublisherName>Gallifrey</PublisherName>
     <MinimumRequiredVersion>1.0.0.0</MinimumRequiredVersion>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.1.0</ApplicationVersion>
+    <ApplicationVersion>1.0.2.0</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>

diff --git a/src/Gallifrey.UI.Classic/MainWindow.cs b/src/Gallifrey.UI.Classic/MainWindow.cs
@@ -46,6 +46,14 @@ public MainWindow(bool isBeta)
             SystemEvents.SessionSwitch += SessionSwitchHandler;
 
             ExceptionlessClient.Current.Register();
+            ExceptionlessClient.Current.UnhandledExceptionReporting += OnUnhandledExceptionReporting;
+        }
+
+        private void OnUnhandledExceptionReporting(object sender, UnhandledExceptionReportingEventArgs e)
+        {
+            e.Error.Tags.Add(lblVersion.Text);
+            e.Error.UserEmail = gallifrey.Settings.JiraConnectionSettings.JiraUsername;
+            e.Error.UserName = gallifrey.Settings.JiraConnectionSettings.JiraUsername;
         }
 
         private void MainWindow_Load(object sender, EventArgs e)

diff --git a/src/Gallifrey/IntegrationPoints/JiraConnection.cs b/src/Gallifrey/IntegrationPoints/JiraConnection.cs
@@ -173,7 +173,7 @@ public void LogTime(Issue jiraIssue, DateTime exportTimeStamp, TimeSpan exportTi
             string remaining = null;
             if (remainingTime.HasValue)
             {
-                remaining = string.Format("{0}h {1}m", exportTime.Hours, exportTime.Minutes);
+                remaining = string.Format("{0}h {1}m", remainingTime.Value.Hours, remainingTime.Value.Minutes);
             }
             try
             {