diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index bbe95d7a..07f4a6d3 100644 Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide index ef6b025a..07ed9fd5 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal index 17cd4000..709448f8 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache index 3ebf020d..0e9b6436 100644 Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache index 41ccb72c..e3bd2f0d 100644 Binary files a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache and b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache differ diff --git a/Switch_Toolbox_Library/Forms/STConsole.cs b/Switch_Toolbox_Library/Forms/STConsole.cs index b9b9c42a..0b6f0c25 100644 --- a/Switch_Toolbox_Library/Forms/STConsole.cs +++ b/Switch_Toolbox_Library/Forms/STConsole.cs @@ -11,7 +11,19 @@ namespace Switch_Toolbox.Library public class STConsole : RichTextBox { private static STConsole console; - public static STConsole Instance { get { return console == null || console.IsDisposed ? console = new STConsole() : console; } } + public static STConsole Instance + { + get + { + if (console == null || console.IsDisposed) + { + console = new STConsole(); + console.Text = ConsoleText; + } + + return console; + } + } private static string ConsoleText = ""; @@ -68,10 +80,10 @@ namespace Switch_Toolbox.Library Color ForeColor = color ?? FormThemes.BaseTheme.TextForeColor; - if (console != null || !console.Disposing || !console.IsDisposed) - console.AppendTextData($"{Line}", ForeColor); + ConsoleText += $"{Line}\n"; - ConsoleText += $"{Line}/n"; + if (console != null && !console.Disposing && !console.IsDisposed) + console.AppendTextData($"{Line}", ForeColor); } private void AppendTextData(string Text, Color color) diff --git a/Switch_Toolbox_Library/Forms/STConsoleForm.Designer.cs b/Switch_Toolbox_Library/Forms/STConsoleForm.Designer.cs index f649429a..4459440d 100644 --- a/Switch_Toolbox_Library/Forms/STConsoleForm.Designer.cs +++ b/Switch_Toolbox_Library/Forms/STConsoleForm.Designer.cs @@ -31,28 +31,30 @@ this.stPanel1 = new Switch_Toolbox.Library.Forms.STPanel(); this.stButton1 = new Switch_Toolbox.Library.Forms.STButton(); this.contentContainer.SuspendLayout(); - this.stPanel1.SuspendLayout(); this.SuspendLayout(); // // contentContainer // + this.contentContainer.Controls.Add(this.stButton1); this.contentContainer.Controls.Add(this.stPanel1); this.contentContainer.Controls.SetChildIndex(this.stPanel1, 0); + this.contentContainer.Controls.SetChildIndex(this.stButton1, 0); // // stPanel1 // - this.stPanel1.Controls.Add(this.stButton1); - this.stPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.stPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.stPanel1.Location = new System.Drawing.Point(0, 25); this.stPanel1.Name = "stPanel1"; - this.stPanel1.Size = new System.Drawing.Size(543, 368); + this.stPanel1.Size = new System.Drawing.Size(543, 336); this.stPanel1.TabIndex = 11; // // stButton1 // this.stButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.stButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.stButton1.Location = new System.Drawing.Point(459, 336); + this.stButton1.Location = new System.Drawing.Point(465, 367); this.stButton1.Name = "stButton1"; this.stButton1.Size = new System.Drawing.Size(75, 23); this.stButton1.TabIndex = 0; @@ -67,7 +69,6 @@ this.Name = "STConsoleForm"; this.Text = "STConsoleForm"; this.contentContainer.ResumeLayout(false); - this.stPanel1.ResumeLayout(false); this.ResumeLayout(false); }