From c5f724328528489c67418f85d3e0c338f34ae824 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Mon, 16 Nov 2015 21:16:13 +0000 Subject: [PATCH] [BF] Anwendung beendete sich nicht nach erfolgtem Checkin --- svnsync/Program.cs | 74 ++++++++++++++------------------ svnsync/bin/Release/SvnSync.exe | Bin 44032 -> 44032 bytes svnsync/svnsync.csproj.user | 2 +- 3 files changed, 34 insertions(+), 42 deletions(-) diff --git a/svnsync/Program.cs b/svnsync/Program.cs index 27faaf5..bb5133d 100644 --- a/svnsync/Program.cs +++ b/svnsync/Program.cs @@ -13,48 +13,40 @@ namespace svnsync /// /// Der Haupteinstiegspunkt für die Anwendung. /// - [STAThread] - static void Main(string[] args) - { - if (!cmd(args)) - { - return; - } - ControllersTray t = null; - try - { - Svn.getInstance().setDirectory(CmdArgs.getInstance().GetArgumentData("-d")); - t = new ControllersTray(); - t.execute(); - } - catch (Exception e) - { - t.hideToolTip(); - string text = e.Message+"\n\n"+e.StackTrace; - string title = "Exception in SVNSync: " + CmdArgs.getInstance().GetArgumentData("-d"); - System.Windows.Forms.MessageBox.Show(text, title, MessageBoxButtons.OK, MessageBoxIcon.Error); - - return; - } - Application.Run(); - return; - /*Application.Run();*/ - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - try - { - Application.Run(new Form1(args)); - } - catch (NotImplementedException e) - { - System.Windows.Forms.MessageBox.Show("In: " + e.Source + "\n\n" + e.Message, "Fehler!", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - catch (Exception /*e*/) - { - //System.Windows.Forms.MessageBox.Show("In: " + e.Source + "\n\n" + e.Message, "Fehler!", MessageBoxButtons.OK, MessageBoxIcon.Error); - Application.Exit(); - } + [STAThread] + static void Main(string[] args) { + if(!cmd(args)) { + return; } + ControllersTray t = null; + try { + Svn.getInstance().setDirectory(CmdArgs.getInstance().GetArgumentData("-d")); + t = new ControllersTray(); + t.execute(); + } catch(Exception e) { + t.hideToolTip(); + string text = e.Message + "\n\n" + e.StackTrace; + string title = "Exception in SVNSync: " + CmdArgs.getInstance().GetArgumentData("-d"); + System.Windows.Forms.MessageBox.Show(text, title, MessageBoxButtons.OK, MessageBoxIcon.Error); + + return; + } + if(!CmdArgs.getInstance().HasArgumentType("-cron")) { + Application.Run(); + } + return; + /*Application.Run();*/ + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + try { + Application.Run(new Form1(args)); + } catch(NotImplementedException e) { + System.Windows.Forms.MessageBox.Show("In: " + e.Source + "\n\n" + e.Message, "Fehler!", MessageBoxButtons.OK, MessageBoxIcon.Error); + } catch(Exception /*e*/) { + //System.Windows.Forms.MessageBox.Show("In: " + e.Source + "\n\n" + e.Message, "Fehler!", MessageBoxButtons.OK, MessageBoxIcon.Error); + Application.Exit(); + } + } private static bool cmd(string[] args) { diff --git a/svnsync/bin/Release/SvnSync.exe b/svnsync/bin/Release/SvnSync.exe index 19e27b59856493a662b32709ccdef7d09a342d9a..72903baf6eda8dedcd8cfe3afb4efd883a672c6e 100644 GIT binary patch delta 1058 zcmXZbUr19?90&04J+?Yqf6&S-+@z(H*hX6#Zkajf92H8n)zpD)F8cEzRQez#HZL1v zWW?45DeNVD$&ds`Jq7JSEC`}{2qTb41)&Ff2*fDpch0?o{rT|yo!{@Cdv`_`*ysYw zWlP=%&g92z%3^-1OG#^ra>&&20AIixIWs*i`DupsGbh}w(DcJa3C5$JAj?lU=<_tA+g+`_uhZD>*|ZYa%nQdTt7 zOzOsdUs7NAl6KJpr%z}cuep`=pj|4%-*G#sQ%dEZ`9V@d&*XiIVpwV(E7T>5XHs)G zK=&z%hE~u^#Xs&~QM{9yN4ZI4-&!H&XJ9f5R?rg^rDbL}m5S#nvTC!J_2Q>g3Qnqw zVMEX4_!z3%M5R7HhQm_&_!#<(Obm=+SW0ZElf{rC(R{I|5b=TxRb=;6BaZuesT>i< zoG$dy_&B~A>Nkg296zMyXirC#K5Pnzi&0^tfeB2@OvM`YOyFv}$WpRr0yl+{(D=G} zfF&>^Lyd2>43SQC)^yR7TM9t{g zH};n0gO#_I3jH~*Y@asHu~_v%Q}dOqIFq;U)@Jh^g&hz7RIu+Yg|g>sO5U~QKbrg1 AiU0rr delta 1047 zcmXZbUr19?90&04Ik`MrB{TYq+ru(S%GI1omaVomM-NK6m461cxrhksp$wGD=GYig zJ?wTNilQFGq8?JXMLk4CR3w3vLlTTq(cC!)uYi52X?+L?`LD zUBgGJB{AA6=L)D6QpZBJyy84d;*!=@noHt=R!A_uAD&&ZGmkjc4#3PQ7SKV1-I&li zr1VH@P-#Z%tT;-Yb6Q1Ov>V~wc6?d5cn|h!jVpC(6~%I@O=*Qly>N$f_TWR>MIXFj zsVjIQJiHIhN+t0|_(&n8yqFamNO8NS-ct$#O0V&aR!QNi(o3wP_msl=2KoyTIY6t5TBF^@Ka|RKkS-{Porv&oU`N8 zs8O=x)9BJQ8JNa^lH5`UPh*fo`EpMQVoVkD7+Y0~49?lDDk6giw$M-U8BA*(cP4lS zvq~>%PeIm?1*JT^6qv;gt$A8Ai|#i0par#N78$7=O!3Qkif3_46-}|kHAK3twc0g8 zn$p_jD)Pga(`s>DAjv;CXqAXkomN7rQ|XErcipAV6G|l&e;7SV*7sD=#fGgDM+R4} zZwdyZv0yyrZ;k|7{7r#agFo8X81o1AM7A|G$6_sw%|WZ;?BAvCf3usTBK1COg_hoF z`&>v^?y<0_r^DJUABNNIp|jUZN42*MB$Bb@bmq&M>o*rVCfp|%<(}<}Tj$DxExVx) nuAF*m8b%GDnlyYX%oj$x8D?&)>hhn}{M~M=`rbS<0+s&(>mAc( diff --git a/svnsync/svnsync.csproj.user b/svnsync/svnsync.csproj.user index eabcac3..83eb743 100644 --- a/svnsync/svnsync.csproj.user +++ b/svnsync/svnsync.csproj.user @@ -1,7 +1,7 @@  - -d "C:\\Users\\netz\\Documents\\Bastelleien" -cron -autoadd -autodelete + -d "E:\Eigene Dateien\Doc%27s\Basteleien" -cron -autoadd -autodelete false Project