[Backend] Fixed bisect logic

Helios747 · Jun 15, 2017 · 31ddbf7 · 31ddbf7
1 parent f2f4585
commit 31ddbf7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/DolphinBisectTool/Backend.cs b/DolphinBisectTool/Backend.cs
@@ -40,7 +40,7 @@ public void Bisect(string boot_title = "")
             int test_index = 0;
             RunBuild run_build = new RunBuild();
 
-            while (m_first_index <= m_second_index)
+            while (!(m_first_index == m_second_index-1))
             {
 
                 test_index = m_first_index == -1 ? (0 + m_second_index) / 2 : (m_first_index + m_second_index) / 2;
@@ -55,9 +55,9 @@ public void Bisect(string boot_title = "")
                 UserInput return_val = BisectEvent(test_index);
 
                 if (return_val == UserInput.Yes)
-                    m_second_index = test_index - 1;
+                    m_first_index = test_index;
                 else if (return_val == UserInput.No)
-                    m_first_index = test_index + 1;
+                    m_second_index = test_index;
                 else
                     return;
             }
@@ -66,7 +66,7 @@ public void Bisect(string boot_title = "")
 
             if (open_url == UserInput.Yes)
             {
-                Process.Start("https://dolp.in/" + m_build_list[test_index+1]);
+                Process.Start("https://dolp.in/" + m_build_list[test_index-1]);
             }
         }
 

diff --git a/DolphinBisectTool/MainWindow.cs b/DolphinBisectTool/MainWindow.cs
@@ -35,7 +35,7 @@ private UserInput BisectUserDialog(int build, bool final_trigger)
             }
             else
             {
-                result = MessageBox.Show("Build " + m_build_list[build] + " may be the cause of your issue. " +
+                result = MessageBox.Show("Build " + m_build_list[build-1] + " may be the cause of your issue. " +
                                          "Do you want to open the URL for that build?", "Notice",
                                          MessageBoxButtons.YesNo);
                 start_button.Enabled = true;
@@ -70,19 +70,16 @@ private void browse_button_Click(object sender, EventArgs e)
 
         private void start_button_Click(object sender, EventArgs e)
         {
-            int first_build;
 
-                first_build = first_dev_build.SelectedIndex;
-
-            if (second_dev_build.SelectedIndex <= first_build)
+            if (second_dev_build.SelectedIndex <= first_dev_build.SelectedIndex)
             {
                 MessageBox.Show("Second build cannot be less than or equal to the first.", "Error", MessageBoxButtons.OK);
                 return;
             }
 
             start_button.Enabled = false;
 
-            Backend backend = new Backend(first_build, second_dev_build.SelectedIndex, m_build_list);
+            Backend backend = new Backend(first_dev_build.SelectedIndex, second_dev_build.SelectedIndex, m_build_list);
             backend.BisectEvent += BisectUserDialog;
             backend.UpdateProgress += ChangeProgressBar;