Most fixes to get NxWM working on the STM3240G-EVAL

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4710 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 10 insertions, 12 deletions

diff --git a/NxWidgets/UnitTests/nxwm/main.cxx b/NxWidgets/UnitTests/nxwm/main.cxx
index 6a6266141..12c5dc513 100644
--- a/NxWidgets/UnitTests/nxwm/main.cxx
+++ b/NxWidgets/UnitTests/nxwm/main.cxx
@@ -230,6 +230,16 @@ int MAIN_NAME(int argc, char *argv[])
 
   initMemoryUsage();
 
+  // Initialize the NSH library
+
+  printf(MAIN_STRING "Initialize the NSH library\n");
+  if (!NxWM::nshlibInitialize())
+    {
+      printf(MAIN_STRING "ERROR: Failed to initialize the NSH library\n");
+      return EXIT_FAILURE;
+    }
+  showTestCaseMemory("After initializing the NSH library");
+
   // Create an instance of the Task Bar.
   //
   // The general sequence for initializing the task bar is:
@@ -316,18 +326,6 @@ int MAIN_NAME(int argc, char *argv[])
     }
   showTestCaseMemory("After create the start window application");
 
-  // Initialize the NSH library
-
-  printf(MAIN_STRING "Initialize the NSH library\n");
-  if (!NxWM::nshlibInitialize())
-    {
-      printf(MAIN_STRING "ERROR: Failed to initialize the NSH library\n");
-      delete window;
-      delete g_nxwmtest.taskbar;
-      return EXIT_FAILURE;
-    }
-  showTestCaseMemory("After initializing the NSH library");
-
   // Add the NxConsole application to the start window
 
   NxWM::CNxConsole *console = (NxWM::CNxConsole *)0; // Avoid compiler complaint