diff --git a/ctl/ctlSQLBox.cpp b/ctl/ctlSQLBox.cpp
index ef8bc78..ec50885 100644
--- a/ctl/ctlSQLBox.cpp
+++ b/ctl/ctlSQLBox.cpp
@@ -994,7 +994,12 @@ wxString ctlSQLBox::ExternalFormat(int typecmd)
 
 
 			processOutput=a.build(processInput, cfg, lineEnd);
-			goto theend;
+			if (isSelected)
+				ReplaceSelection(processOutput);
+			else
+				SetText(processOutput);
+
+			return _("" + msgword + "ing complete.");
 		}
 		return _("You need to setup a "+msgword+"ing command");
 	}
@@ -1051,7 +1056,6 @@ wxString ctlSQLBox::ExternalFormat(int typecmd)
 	{
 		return _("" + msgword + "ing command error: Output is empty.");
 	}
-theend:
 	if (isSelected)
 		ReplaceSelection(processOutput);
 	else
diff --git a/ctl/ctlShortCut.cpp b/ctl/ctlShortCut.cpp
index 529d9dc..6ca0640 100644
--- a/ctl/ctlShortCut.cpp
+++ b/ctl/ctlShortCut.cpp
@@ -188,7 +188,6 @@ void dlgShortCut::OnKEY_DOWN(wxKeyEvent& event) {
     if (event.GetKeyCode() == WXK_ESCAPE) {
         Close(true);
     }
-    HWND f=GetFocus();
     if (!cb->HasFocus()) {
 
     }