[BF] Anwendung beendete sich nicht nach erfolgtem Checkin

This commit is contained in:
BlubbFish 2015-11-16 21:16:13 +00:00
parent 33e5675b9e
commit c5f7243285
3 changed files with 34 additions and 42 deletions

View File

@ -13,48 +13,40 @@ namespace svnsync
/// <summary> /// <summary>
/// Der Haupteinstiegspunkt für die Anwendung. /// Der Haupteinstiegspunkt für die Anwendung.
/// </summary> /// </summary>
[STAThread] [STAThread]
static void Main(string[] args) static void Main(string[] args) {
{ if(!cmd(args)) {
if (!cmd(args)) return;
{
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();
}
} }
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) private static bool cmd(string[] args)
{ {

Binary file not shown.

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<StartArguments>-d "C:\\Users\\netz\\Documents\\Bastelleien" -cron -autoadd -autodelete</StartArguments> <StartArguments>-d "E:\Eigene Dateien\Doc%27s\Basteleien" -cron -autoadd -autodelete</StartArguments>
<RemoteDebugEnabled>false</RemoteDebugEnabled> <RemoteDebugEnabled>false</RemoteDebugEnabled>
<StartAction>Project</StartAction> <StartAction>Project</StartAction>
</PropertyGroup> </PropertyGroup>