ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debug: Lässt Prozess Killen zu - Release: Blockiert

Browse Source
This commit is contained in:
Rene Evertz
2024-05-27 09:51:28 +02:00
parent 44dfcad633
commit 3dcfc8cb0e
2 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
BeWoLauncher/Logic/Controller/ProcessController.cs
View File

@@ -22,13 +22,38 @@ namespace BeWoLauncher.Logic.Controller
internal static void CheckForOtherInstance()
{
string message = "Möchten Sie es schließen? Dadurch können nicht gespeicherte Daten verloren gehen.";
string caption = "BeWo Anwendung läuft bereits. ";
string procName = Process.GetCurrentProcess().ProcessName;
Action show_error = () =>
Process[] processes = Process.GetProcessesByName(procName);
if (processes.Length > 1)
{
HandleProzessAlreadyRunning(false);
return;
}
Process[] processes2 = Process.GetProcessesByName("BeWoPlaner");
if (processes2.Length > 0)
{
HandleProzessAlreadyRunning(false);
return;
}
}
internal static void HandleProzessAlreadyRunning(bool letUserKill)
{
#if DEBUG
letUserKill = true;
#endif
if (letUserKill)
{
string message = "Möchten Sie es schließen? Dadurch können nicht gespeicherte Daten verloren gehen.";
string caption = "BeWo Anwendung läuft bereits. ";
var result = MessageBox.Show(message, caption, MessageBoxButton.YesNo);
if (result == MessageBoxResult.Yes)
{
var own_process_id = Process.GetCurrentProcess().Id;
@@ -41,24 +66,15 @@ namespace BeWoLauncher.Logic.Controller
{
StartLauncherShutdown();
}
};
string procName = Process.GetCurrentProcess().ProcessName;
Process[] processes = Process.GetProcessesByName(procName);
if (processes.Length > 1)
{
show_error();
return;
}
Process[] processes2 = Process.GetProcessesByName("BeWoPlaner");
if (processes2.Length > 0)
else
{
show_error();
return;
string message = "Möchten Sie es schließen? Dadurch können nicht gespeicherte Daten verloren gehen.";
string caption = "BeWo Anwendung läuft bereits. ";
MessageBox.Show(message, caption);
StartLauncherShutdown();
}
}

1
Service/ServiceImplementations/DownloadBeWoServiceImp.cs
View File

@@ -131,7 +131,6 @@ namespace BeWo.Service.ServiceImplementations
server_address = "http://localhost:3777/Host";
#endif
ServiceFacade.UpdateServerAddresses(server_address);
var result = ServiceFacade.DoLauncherServiceSync(x => x.IsUserValid(username, password, pin, clientid, true));