From d8056b3deb7437ae6beffdbdce83275b08fcb105 Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Tue, 14 Jul 2020 19:18:59 -0400 Subject: [PATCH] Move code to avoid NRE --- src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index f9a2016820..ccbdda4649 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -105,14 +105,15 @@ namespace BizHawk.Client.EmuHawk public TAStudio() { + Settings = new TAStudioSettings(); + InitializeComponent(); + RecentSubMenu.Image = Resources.Recent; recentMacrosToolStripMenuItem.Image = Resources.Recent; TASEditorManualOnlineMenuItem.Image = Resources.Help; ForumThreadMenuItem.Image = Resources.TAStudio; Icon = Resources.TAStudio_MultiSize; - Settings = new TAStudioSettings(); - InitializeComponent(); InitializeSeekWorker(); _defaultMainSplitDistance = MainVertialSplit.SplitterDistance;