[chronojump] Better cancel on chronopic detection
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Better cancel on chronopic detection
- Date: Mon, 28 Jan 2013 20:32:36 +0000 (UTC)
commit d834f81868c497d8aba834565f3e8e09246defdb
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Jan 28 21:32:20 2013 +0100
Better cancel on chronopic detection
src/gui/chronopic.cs | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/src/gui/chronopic.cs b/src/gui/chronopic.cs
index 4104ccd..3e29285 100644
--- a/src/gui/chronopic.cs
+++ b/src/gui/chronopic.cs
@@ -107,6 +107,7 @@ public class ChronopicWindow
bool connected;
bool volumeOn;
int currentCp; //1 to 4
+ bool cancelledByUser;
//cp1
Chronopic cp;
@@ -502,7 +503,7 @@ Log.WriteLine("bbb");
Log.WriteLine("chronopicInit-5");
ok=myCp.Read_platform(out myPS);
Log.WriteLine("chronopicInit-6");
- } while(!ok);
+ } while(! ok && ! cancelledByUser);
Log.WriteLine("chronopicInit-7");
if (!ok) {
//-- Si hay error terminar
@@ -600,6 +601,7 @@ Log.WriteLine("bbb");
fakeConnectionButton.Clicked += new EventHandler(on_chronopic_detection_ended);
needUpdateChronopicWin = false;
+ cancelledByUser = false;
thread = new Thread(new ThreadStart(waitChronopicStart));
GLib.Idle.Add (new GLib.IdleHandler (PulseGTK));
thread.Start();
@@ -757,6 +759,7 @@ Log.WriteLine("bbb");
//fakeButtonCancelled.Click(); //just to show message of crashing on windows exiting
cpDoing.AbortFlush = true;
+ cancelledByUser = true;
//kill the chronopicInit function that is waiting event
//thread.Abort();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]