--- previous/src/debug/debugui.c	2018/04/24 19:32:11	1.1.1.3
+++ previous/src/debug/debugui.c	2018/04/24 19:34:01	1.1.1.4
@@ -27,7 +27,6 @@ const char DebugUI_fileid[] = "Hatari de
 #include "file.h"
 #include "log.h"
 #include "m68000.h"
-#include "options.h"
 #include "screen.h"
 #include "statusbar.h"
 #include "str.h"
@@ -315,7 +314,7 @@ static int DebugUI_SetOptions(int argc,
 
 	/* get configuration changes */
 	current = ConfigureParams;
-
+#if 0
 	/* Parse and apply options */
 	if (Opt_ParseParameters(argc, (const char * const *)argv))
 	{
@@ -323,6 +322,7 @@ static int DebugUI_SetOptions(int argc,
 		Change_CopyChangedParamsToConfiguration(&current, &ConfigureParams, false);
 	}
 	else
+#endif
 	{
 		ConfigureParams = current;
 	}
@@ -779,7 +779,7 @@ static const dbgcommand_t uicommand[] =
 	  "[filename]\n"
 	  "\tRead debugger commands from given file and do them.",
 	  false },
-	{ DebugUI_SetOptions, Opt_MatchOption,
+	{ DebugUI_SetOptions, NULL /* Opt_MatchOption */,
 	  "setopt", "o",
 	  "set Hatari command line and debugger options",
 	  "[<bin|dec|hex>|<command line options>]\n"
@@ -813,8 +813,9 @@ void DebugUI_Init(void)
     const dbgcommand_t *cpucmd;
     int cpucmds;
 
-    if(!(debugOutput))
-        debugOutput = stderr;
+    if(!(debugOutput)){
+        debugOutput = stderr;		
+	} 
         
 	/* already intialized? */
 	if (debugCommands)
@@ -916,9 +917,10 @@ void DebugUI(void)
 	while (cmdret != DEBUGGER_END);
     
     /* free (and ignore) exit command */
-    if (psCmd)
-        free(psCmd);
-
+    if (psCmd) {
+       free(psCmd);		
+	}
+ 
 	Log_SetAlertLevel(alertLevel);
 	DebugUI_SetLogDefault();