--- uae/src/od-amiga/ami-appw.c	2018/04/24 16:40:30	1.1.1.1
+++ uae/src/od-amiga/ami-appw.c	2018/04/24 16:42:51	1.1.1.2
@@ -15,10 +15,29 @@
 
 #include <dos/dos.h>
 
+#if defined(POWERUP)
+#ifndef USE_CLIB
+#include <powerup/ppcproto/intuition.h>
+#include <powerup/ppcproto/exec.h>
+#include <powerup/ppcproto/dos.h>
+/*#include <workbench/workbench.h> sam: a effacer*/
+#include <powerup/ppcproto/wb.h>
+#else
+#include <clib/intuition_protos.h>
+#include <clib/exec_protos.h>
+#include <clib/dos_protos.h>
+#include <clib/wb_protos.h>
+#endif
+
+#define AddAppWindow(a0, a1, a2, a3, tags...) \
+	({ULONG _tags[] = { tags }; AddAppWindowA((a0), (a1), (a2), (a3), (struct TagItem *)_tags);})
+
+#else
 #include <proto/intuition.h>
 #include <proto/exec.h>
 #include <proto/dos.h>
 #include <proto/wb.h>
+#endif
 
 /****************************************************************************/
 
@@ -110,14 +129,14 @@ void appw_events(void)
 
             strcpy(cmd,"cd ");
             NameFromLock(arg[0].wa_Lock,&cmd[3],LEN-3);
-            uaeexe(cmd);
-
-	    strcpy(cmd,"run ");strcpy(cmd+4,arg[0].wa_Name);
-            for(i=1;i<msg->am_NumArgs;++i)
-                addcmd(cmd,LEN-2,arg[i].wa_Lock,arg[i].wa_Name);
-                /*             ^        */
-                /* 2 bytes for security */
-            uaeexe(cmd);
+            if(!uaeexe(cmd)) {
+	       strcpy(cmd,"run ");strcpy(cmd+4,arg[0].wa_Name);
+               for(i=1;i<msg->am_NumArgs;++i)
+                   addcmd(cmd,LEN-2,arg[i].wa_Lock,arg[i].wa_Name);
+                   /*             ^        */
+                   /* 2 bytes for security */
+               uaeexe(cmd);
+            }
             ReplyMsg((void*)msg);
         }
     }