diff options
| author | AShifter <[email protected]> | 2017-10-01 08:23:50 -0600 |
|---|---|---|
| committer | AShifter <[email protected]> | 2017-10-01 08:23:50 -0600 |
| commit | 46fe7eb7098dd31b186e13e228fede07c46ee064 (patch) | |
| tree | e6fbc5ac67890b11293f682c279ff7670ecef8cf /ShiftOS.Main/Program.cs | |
| parent | f5004702c46d6c99737a0519d7d6735307c7501a (diff) | |
| parent | f2ed0c673c2d3f0e021b0307a22792af66fd217d (diff) | |
| download | shiftos-rewind-46fe7eb7098dd31b186e13e228fede07c46ee064.tar.gz shiftos-rewind-46fe7eb7098dd31b186e13e228fede07c46ee064.tar.bz2 shiftos-rewind-46fe7eb7098dd31b186e13e228fede07c46ee064.zip | |
Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master'
Diffstat (limited to 'ShiftOS.Main/Program.cs')
| -rw-r--r-- | ShiftOS.Main/Program.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ShiftOS.Main/Program.cs b/ShiftOS.Main/Program.cs index 5464d8e..10277b0 100644 --- a/ShiftOS.Main/Program.cs +++ b/ShiftOS.Main/Program.cs @@ -1,8 +1,7 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; using System.Windows.Forms; +using ShiftOS.Main.ShiftOS; namespace ShiftOS.Main { @@ -16,7 +15,10 @@ namespace ShiftOS.Main { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new TestForm()); + + Parallel.Invoke( + () => Application.Run(new TestForm()), + () => Application.Run(new Desktop())); } } } |
