Skip to content

Commit 41cf4fd

Browse files
unitycoderunitycoder
committed
if project is already launched then bring Unity instance to front, move Editor process references to separate class (so that it doesn't reset on project list refresh, fixes #19 )
1 parent 4da6954 commit 41cf4fd

File tree

5 files changed

+148
-43
lines changed

5 files changed

+148
-43
lines changed

‎UnityLauncherPro/Data/Project.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,19 @@ public class Project : IValueConverter
1515
public string GITBranch { set; get; }
1616
//public string TargetPlatform { set; get; }
1717
public string TargetPlatform { set; get; }
18-
1918
public string[] TargetPlatforms { set; get; }
20-
21-
2219
public bool folderExists { set; get; }
23-
public Process Process; // launched unity exe
2420

2521
public override string ToString()
2622
{
2723
return $"{Title} {Version} {Path} {Modified} {Arguments} {GITBranch} {TargetPlatform}";
2824
}
2925

30-
// https://stackoverflow.com/a/5551986/5452781
26+
// change datagrid colors based on value using converter https://stackoverflow.com/a/5551986/5452781
3127
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
3228
{
3329
bool b = (bool)value;
3430
return b;
35-
//return string.IsNullOrEmpty(str);
3631
}
3732

3833
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

‎UnityLauncherPro/Helpers/ProcessHandler.cs

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
// keeps reference of launched unity processes, so that can close them even if project list is refreshed
2+
3+
using System;
4+
using System.Collections.Generic;
5+
using System.Diagnostics;
6+
using System.Runtime.InteropServices;
7+
using System.Windows;
8+
using System.Windows.Threading;
9+
10+
namespace UnityLauncherPro.Helpers
11+
{
12+
public static class ProcessHandler
13+
{
14+
static Dictionary<string, Process> processes = new Dictionary<string, Process>();
15+
16+
public static void Add(Project proj, Process proc)
17+
{
18+
if (proc == null) return;
19+
20+
var key = proj.Path;
21+
if (processes.ContainsKey(key))
22+
{
23+
// already in the list, maybe trying to launch same project twice? only overwrite if previous process has closed
24+
if (processes[key] == null) processes[key] = proc;
25+
}
26+
else
27+
{
28+
processes.Add(key, proc);
29+
}
30+
31+
// subscribe to process exit here, so that can update proj details row (if it was changed in Unity)
32+
proc.Exited += (object o, EventArgs ea) =>
33+
{
34+
// call method in mainwindow, to easy access for sourcedata and grid
35+
Application.Current.Dispatcher.Invoke(DispatcherPriority.Background, (Action)delegate ()
36+
{
37+
MainWindow wnd = (MainWindow)Application.Current.MainWindow;
38+
wnd.ProcessExitedCallBack(proj);
39+
});
40+
41+
// remove closed process item
42+
Remove(key);
43+
};
44+
}
45+
46+
public static Process Get(string key)
47+
{
48+
if (processes.ContainsKey(key)) return processes[key];
49+
return null;
50+
}
51+
52+
public static bool IsRunning(string key)
53+
{
54+
return processes.ContainsKey(key) && (processes[key] != null);
55+
}
56+
57+
public static void Remove(string key)
58+
{
59+
if (processes.ContainsKey(key)) processes.Remove(key);
60+
}
61+
}
62+
}

‎UnityLauncherPro/MainWindow.xaml.cs

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
using System.Windows.Input;
1919
using System.Windows.Media;
2020
using System.Windows.Shell;
21+
using UnityLauncherPro.Helpers;
2122

2223
namespace UnityLauncherPro
2324
{
@@ -91,6 +92,7 @@ void Start()
9192
myMutex = new Mutex(true, appName, out aIsNewInstance);
9293
if (!aIsNewInstance)
9394
{
95+
// NOTE doesnt work if its minized to tray
9496
ActivateOtherWindow();
9597
App.Current.Shutdown();
9698
}
@@ -142,8 +144,7 @@ private static void ActivateOtherWindow()
142144
if (other != IntPtr.Zero)
143145
{
144146
SetForegroundWindow(other);
145-
if (IsIconic(other))
146-
OpenIcon(other);
147+
if (IsIconic(other)) OpenIcon(other);
147148
}
148149
}
149150

@@ -192,7 +193,8 @@ void HandleCommandLineLaunch()
192193
{
193194
// try launching it
194195
var proc = Tools.LaunchProject(proj);
195-
proj.Process = proc;
196+
//proj.Process = proc;
197+
//ProcessHandler.Add(proj, proc);
196198
}
197199

198200
// quit after launch if enabled in settings
@@ -828,30 +830,8 @@ private void BtnLaunchProject_Click(object sender, RoutedEventArgs e)
828830
{
829831
var proj = GetSelectedProject();
830832
var proc = Tools.LaunchProject(proj, gridRecent);
831-
proj.Process = proc;
832833

833-
// subscribe to process exit, so that can update proj details row (if it was changed in Unity)
834-
proj.Process.Exited += (object o, EventArgs ea) =>
835-
{
836-
Console.WriteLine("Unity closed, update this project: " + proj);
837-
838-
// call update on main thread, TODO move this to Tools?
839-
this.Dispatcher.Invoke(() =>
840-
{
841-
//Console.WriteLine("got project "+gridRecent.Items.Contains(proj));
842-
var index = projectsSource.IndexOf(proj);
843-
var tempProj = projectsSource[index];
844-
tempProj.Modified = Tools.GetLastModifiedTime(proj.Path);
845-
tempProj.Version = Tools.GetProjectVersion(proj.Path);
846-
tempProj.GITBranch = Tools.ReadGitBranchInfo(proj.Path);
847-
tempProj.TargetPlatform = Tools.GetTargetPlatform(proj.Path);
848-
projectsSource[index] = tempProj;
849-
850-
// TODO no need to update every item though..
851-
gridRecent.Items.Refresh();
852-
853-
});
854-
};
834+
//ProcessHandler.Add(proj, proc);
855835

856836
Tools.SetFocusToGrid(gridRecent);
857837
}
@@ -963,7 +943,7 @@ private void TxtSearchBox_PreviewKeyDown(object sender, KeyEventArgs e)
963943
case Key.Return: // open selected project
964944
var proj = GetSelectedProject();
965945
var proc = Tools.LaunchProject(proj);
966-
proj.Process = proc;
946+
//ProcessHandler.Add(proj, proc);
967947
break;
968948
case Key.Tab:
969949
case Key.Up:
@@ -1055,7 +1035,7 @@ private void GridRecent_PreviewKeyDown(object sender, KeyEventArgs e)
10551035
e.Handled = true;
10561036
var proj = GetSelectedProject();
10571037
var proc = Tools.LaunchProject(proj);
1058-
proj.Process = proc;
1038+
//ProcessHandler.Add(proj, proc);
10591039
break;
10601040
default:
10611041
break;
@@ -1441,7 +1421,7 @@ private void GridRecent_PreviewMouseDoubleClick(object sender, MouseButtonEventA
14411421

14421422
var proj = GetSelectedProject();
14431423
var proc = Tools.LaunchProject(proj);
1444-
proj.Process = proc;
1424+
//ProcessHandler.Add(proj, proc);
14451425
}
14461426

14471427
private void DataGridUnitys_PreviewMouseDoubleClick(object sender, MouseButtonEventArgs e)
@@ -1727,16 +1707,18 @@ private void MenuItemKillProcess_Click(object sender, RoutedEventArgs e)
17271707
void KillSelectedProcess(object sender, ExecutedRoutedEventArgs e)
17281708
{
17291709
var proj = GetSelectedProject();
1730-
if (proj.Process != null)
1710+
var proc = ProcessHandler.Get(proj.Path);
1711+
if (proj != null && proc != null)
17311712
{
17321713
try
17331714
{
1734-
proj.Process.Kill();
1715+
proc.Kill();
17351716
}
17361717
catch (Exception)
17371718
{
17381719
}
1739-
proj.Process = null;
1720+
//proc.Dispose(); // NOTE cannot dispose, otherwise process.Exited event is not called
1721+
proj = null;
17401722
}
17411723
}
17421724

@@ -1745,7 +1727,8 @@ private void GridRecent_ContextMenuOpening(object sender, ContextMenuEventArgs e
17451727
if (tabControl.SelectedIndex == 0)
17461728
{
17471729
var proj = GetSelectedProject();
1748-
menuItemKillProcess.IsEnabled = proj.Process != null;
1730+
var proc = ProcessHandler.Get(proj.Path);
1731+
menuItemKillProcess.IsEnabled = proc != null;
17491732
}
17501733
}
17511734

@@ -1892,7 +1875,8 @@ private void MenuStartWebGLServer_Click(object sender, RoutedEventArgs e)
18921875
int port = rnd.Next(50000, 61000);
18931876

18941877
// take process id from unity, if have it (then webserver closes automatically when unity is closed)
1895-
int pid = proj.Process == null ? -1 : proj.Process.Id;
1878+
var proc = ProcessHandler.Get(proj.Path);
1879+
int pid = proc == null ? -1 : proc.Id;
18961880
var param = "\"" + webExe + "\" \"" + buildPath + "\" " + port + (pid == -1 ? "" : " " + pid); // server exe path, build folder and port
18971881

18981882
// then open browser
@@ -2242,5 +2226,27 @@ private void BtnResources_Click(object sender, RoutedEventArgs e)
22422226
{
22432227
Tools.OpenURL(resourcesURL);
22442228
}
2229+
2230+
public void ProcessExitedCallBack(Project proj)
2231+
{
2232+
Console.WriteLine("Process Exited: " + proj.Path);
2233+
//var index = projectsSource.IndexOf(proj); // this fails since proj has changed after refresh (timestamp or other data)
2234+
2235+
// FIXME nobody likes extra loops.. but only 40 items to find correct project?
2236+
for (int i = 0, len = projectsSource.Count; i < len; i++)
2237+
{
2238+
if (projectsSource[i].Path == proj.Path)
2239+
{
2240+
var tempProj = projectsSource[i];
2241+
tempProj.Modified = Tools.GetLastModifiedTime(proj.Path);
2242+
tempProj.Version = Tools.GetProjectVersion(proj.Path);
2243+
tempProj.GITBranch = Tools.ReadGitBranchInfo(proj.Path);
2244+
tempProj.TargetPlatform = Tools.GetTargetPlatform(proj.Path);
2245+
projectsSource[i] = tempProj;
2246+
gridRecent.Items.Refresh();
2247+
break;
2248+
}
2249+
}
2250+
}
22452251
} // class
22462252
} //namespace

‎UnityLauncherPro/Tools.cs

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,31 @@
55
using System.IO;
66
using System.Linq;
77
using System.Net;
8+
using System.Runtime.InteropServices;
89
using System.Text;
910
using System.Text.RegularExpressions;
1011
using System.Windows;
1112
using System.Windows.Controls;
1213
using System.Windows.Input;
14+
using UnityLauncherPro.Helpers;
1315

1416
namespace UnityLauncherPro
1517
{
1618
public static class Tools
1719
{
20+
const int SW_RESTORE = 9;
21+
22+
[DllImport("user32", CharSet = CharSet.Unicode)]
23+
static extern IntPtr FindWindow(string cls, string win);
24+
[DllImport("user32")]
25+
static extern IntPtr SetForegroundWindow(IntPtr hWnd);
26+
[DllImport("user32")]
27+
static extern bool IsIconic(IntPtr hWnd);
28+
[DllImport("user32")]
29+
static extern bool OpenIcon(IntPtr hWnd);
30+
[DllImport("user32")]
31+
private static extern bool ShowWindow(IntPtr handle, int nCmdShow);
32+
1833
// returns last modified date for file (or null if cannot get it)
1934
public static DateTime? GetLastModifiedTime(string path)
2035
{
@@ -150,7 +165,20 @@ public static Process LaunchProject(Project proj, DataGrid dataGridRef = null)
150165
if (proj == null) return null;
151166
if (Directory.Exists(proj.Path) == false) return null;
152167

153-
Console.WriteLine("launch project " + proj.Title + " " + proj.Version);
168+
Console.WriteLine("Launching project " + proj.Title + " at " + proj.Path);
169+
170+
// check if this project path has unity already running? (from lock file or process)
171+
// NOTE this check only works if previous unity instance was started while we were running
172+
if (ProcessHandler.IsRunning(proj.Path))
173+
{
174+
Console.WriteLine("Project is already running, lets not launch unity.. because it opens Hub");
175+
BringProcessToFront(ProcessHandler.Get(proj.Path));
176+
return null;
177+
}
178+
else
179+
{
180+
// TODO check lock file?
181+
}
154182

155183
// there is no assets path, probably we want to create new project then
156184
var assetsFolder = Path.Combine(proj.Path, "Assets");
@@ -216,6 +244,8 @@ public static Process LaunchProject(Project proj, DataGrid dataGridRef = null)
216244
// NOTE move project as first, since its opened, disabled for now, since its too jumpy..
217245
//MainWindow wnd = (MainWindow)Application.Current.MainWindow;
218246
//wnd.MoveRecentGridItem(0);
247+
248+
ProcessHandler.Add(proj, newProcess);
219249
return newProcess;
220250
}
221251

@@ -679,7 +709,6 @@ public static void DisplayUpgradeDialog(Project proj, MainWindow owner)
679709
// inject new version for this item
680710
proj.Version = upgradeToVersion;
681711
var proc = LaunchProject(proj);
682-
proj.Process = proc;
683712
}
684713
else
685714
{
@@ -977,7 +1006,7 @@ public static void FastCreateProject(string version, string baseFolder, string p
9771006
proj.Path = Path.Combine(baseFolder, newPath);
9781007
proj.Version = version;
9791008
var proc = LaunchProject(proj);
980-
proj.Process = proc;
1009+
ProcessHandler.Add(proj, proc);
9811010
} // FastCreateProject
9821011

9831012

@@ -1142,5 +1171,17 @@ public static bool ValidateDateFormat(string format)
11421171
}
11431172
}
11441173

1174+
// https://stackoverflow.com/a/37724335/5452781
1175+
public static void BringProcessToFront(Process process)
1176+
{
1177+
IntPtr handle = process.MainWindowHandle;
1178+
if (IsIconic(handle))
1179+
{
1180+
ShowWindow(handle, SW_RESTORE);
1181+
}
1182+
1183+
SetForegroundWindow(handle);
1184+
}
1185+
11451186
} // class
11461187
} // namespace

‎UnityLauncherPro/UnityLauncherPro.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
<Compile Include="GetProjects.cs" />
8383
<Compile Include="GetUnityInstallations.cs" />
8484
<Compile Include="GetUnityUpdates.cs" />
85+
<Compile Include="Helpers\ProcessHandler.cs" />
8586
<Compile Include="Libraries\ExtractTarGz.cs" />
8687
<Compile Include="NewProject.xaml.cs">
8788
<DependentUpon>NewProject.xaml</DependentUpon>

0 commit comments

Comments
 (0)