From 0a7c2d4dc020b58dacf1d0cf50403d101f176d72 Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Mon, 1 May 2017 10:15:32 +0100 Subject: Trying to fix conficts II --- .vs/TimeHACK/v15/.suo | Bin 162816 -> 163328 bytes TimeHACK.Main/OS/Win95/Win95.cs | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.vs/TimeHACK/v15/.suo b/.vs/TimeHACK/v15/.suo index 196d511..1448558 100644 Binary files a/.vs/TimeHACK/v15/.suo and b/.vs/TimeHACK/v15/.suo differ diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 63c493a..1e68101 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -158,7 +158,7 @@ namespace TimeHACK.OS.Win95 private void NotePadToolStripMenuItem_Click(object sender, EventArgs e) { - Win95Notepad wp = new Win95Notepad(); + WinClassicNotepad wp = new WinClassicNotepad(); WinClassic app = wm.startWin95(wp, "Notepad", Properties.Resources.Win95IconNotepad, true, true); AddTaskBarItem(app, app.Tag.ToString(), "Notepad", Properties.Resources.Win95IconNotepad); -- cgit v1.2.3