From ea071f0b466e630f8c09a91e32c0bc2017853c5a Mon Sep 17 00:00:00 2001
From: penfold42 <penfold42@users.noreply.github.com>
Date: Mon, 23 Jul 2018 09:06:11 +1000
Subject: [PATCH] code cleanup

---
 src/iec_commands.cpp |  3 ---
 src/main.cpp         | 22 ++++++++++------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/iec_commands.cpp b/src/iec_commands.cpp
index 0d70a2c..c3af2de 100644
--- a/src/iec_commands.cpp
+++ b/src/iec_commands.cpp
@@ -1100,9 +1100,6 @@ void IEC_Commands::New(void)
 	{
 		FILINFO filInfo;
 
-		if(!(strstr(filenameNew, ".d64") || strstr(filenameNew, ".D64")))
-			strcat(filenameNew, ".d64");
-
 		int ret = CreateD64(filenameNew, ID, true);
 
 		if (ret==0)
diff --git a/src/main.cpp b/src/main.cpp
index 9a3b4b4..e6cda8c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -737,17 +737,14 @@ void emulator()
 							CheckAutoMountImage(EXIT_UNKNOWN, fileBrowser);
 							break;
 						case IEC_Commands::NONE:
-							{
-								fileBrowser->Update();
+							fileBrowser->Update();
 
-								// Check selections made via FileBrowser
-								if (fileBrowser->SelectionsMade())
-									emulating = BeginEmulating(fileBrowser, fileBrowser->LastSelectionName());
-							}
+							// Check selections made via FileBrowser
+							if (fileBrowser->SelectionsMade())
+								emulating = BeginEmulating(fileBrowser, fileBrowser->LastSelectionName());
 							break;
 						case IEC_Commands::IMAGE_SELECTED:
-						{
-							// Check selections made via FileBrowser
+							// Check selections made via IEC commands (like fb64)
 
 							fileBrowserSelectedName = m_IEC_Commands.GetNameOfImageSelected();
 
@@ -769,8 +766,10 @@ void emulator()
 								DEBUG_LOG("IEC mounting %s\r\n", filInfoSelected->fname);
 								bool readOnly = (filInfoSelected->fattrib & AM_RDO) != 0;
 
-								if (diskCaddy.Insert(filInfoSelected, readOnly)) emulating = BeginEmulating(fileBrowser, filInfoSelected->fname);
-								else fileBrowserSelectedName = 0;
+								if (diskCaddy.Insert(filInfoSelected, readOnly))
+									emulating = BeginEmulating(fileBrowser, filInfoSelected->fname);
+								else
+									fileBrowserSelectedName = 0;
 							}
 							else
 							{
@@ -781,8 +780,7 @@ void emulator()
 								m_IEC_Commands.Reset();
 
 							selectedViaIECCommands = true;
-						}
-						break;
+							break;
 						case IEC_Commands::DIR_PUSHED:
 							fileBrowser->FolderChanged();
 							break;