diff --git a/svnsync/Libraries/Svn.cs b/svnsync/Libraries/Svn.cs index f451f32..494510a 100644 --- a/svnsync/Libraries/Svn.cs +++ b/svnsync/Libraries/Svn.cs @@ -84,7 +84,6 @@ namespace svnsync.Libraries { internal void SetArgCheckIn(String message) { String arg = "ci -m \"" + message + "\""; - System.Threading.Thread.Sleep(1000000); this.Runner(arg); } diff --git a/svnsync/Program.cs b/svnsync/Program.cs index 9bdf4d2..56c09d9 100644 --- a/svnsync/Program.cs +++ b/svnsync/Program.cs @@ -42,6 +42,7 @@ namespace svnsync #if !DEBUG FileMutex.Instance.Delete(); #endif + Updater.Instance.WaitForExit(); return; } if (!CmdArgs.Instance.HasArgumentType("-cron")) { @@ -50,18 +51,8 @@ namespace svnsync #if !DEBUG FileMutex.Instance.Delete(); #endif + Updater.Instance.WaitForExit(); 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 void Update() { @@ -74,7 +65,9 @@ namespace svnsync private static void HasUpdate(Object sender, UpdaterEventArgs e) { if(e.HasUpdates) { - ((Updater)sender).Update(); + #if !DEBUG + ((Updater)sender).Update(); + #endif } } diff --git a/svnsync/Properties/AssemblyInfo.cs b/svnsync/Properties/AssemblyInfo.cs index e4baa4e..d3d24c6 100644 --- a/svnsync/Properties/AssemblyInfo.cs +++ b/svnsync/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ using System.Resources; // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.6.1")] -[assembly: AssemblyFileVersion("1.0.6.1")] +[assembly: AssemblyVersion("1.0.6.2")] +[assembly: AssemblyFileVersion("1.0.6.2")] [assembly: NeutralResourcesLanguageAttribute("de-DE")] diff --git a/svnsync/bin/Release/SvnSync.exe b/svnsync/bin/Release/SvnSync.exe index 7f34061..06d785e 100644 Binary files a/svnsync/bin/Release/SvnSync.exe and b/svnsync/bin/Release/SvnSync.exe differ diff --git a/svnsync/bin/Release/Utils.dll b/svnsync/bin/Release/Utils.dll index 6b08d69..07242b1 100644 Binary files a/svnsync/bin/Release/Utils.dll and b/svnsync/bin/Release/Utils.dll differ diff --git a/svnsync/bin/Release/version.xml b/svnsync/bin/Release/version.xml index 3d36f9e..bbd614d 100644 --- a/svnsync/bin/Release/version.xml +++ b/svnsync/bin/Release/version.xml @@ -1,5 +1,5 @@  - SvnSync - Utils + SvnSync + Utils \ No newline at end of file