diff --git a/ClangOutputParser/clang_result_lexer.cpp b/ClangOutputParser/clang_result_lexer.cpp
index 8075b28171..cc8ad2e02f 100644
--- a/ClangOutputParser/clang_result_lexer.cpp
+++ b/ClangOutputParser/clang_result_lexer.cpp
@@ -1669,7 +1669,7 @@ char msg[];
 #endif
 	{
 	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
+	// exit( YY_EXIT_FAILURE );
 	}
 
 
diff --git a/CommentParser/CommentParser/comment_parser.cpp b/CommentParser/CommentParser/comment_parser.cpp
index 8f289b311b..9b82757793 100644
--- a/CommentParser/CommentParser/comment_parser.cpp
+++ b/CommentParser/CommentParser/comment_parser.cpp
@@ -1606,7 +1606,7 @@ char msg[];
 #endif
 	{
 	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
+	// exit( YY_EXIT_FAILURE );
 	}
 
 
diff --git a/CxxParser/cpp_expr_lexer.cpp b/CxxParser/cpp_expr_lexer.cpp
index 0401bcd7ec..f473a41b7b 100644
--- a/CxxParser/cpp_expr_lexer.cpp
+++ b/CxxParser/cpp_expr_lexer.cpp
@@ -2526,7 +2526,7 @@ char msg[];
 #endif
 	{
 	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
+	// exit( YY_EXIT_FAILURE );
 	}
 
 
diff --git a/CxxParser/cpp_lexer.cpp b/CxxParser/cpp_lexer.cpp
index 56e1126a39..182d16a31c 100644
--- a/CxxParser/cpp_lexer.cpp
+++ b/CxxParser/cpp_lexer.cpp
@@ -2588,7 +2588,7 @@ char msg[];
 #endif
 	{
 	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
+	// exit( YY_EXIT_FAILURE );
 	}
 
 
diff --git a/FileCrawler/trunk/fileCrawler/crawler_lexer.cpp b/FileCrawler/trunk/fileCrawler/crawler_lexer.cpp
index a4784d9598..6958c190ad 100644
--- a/FileCrawler/trunk/fileCrawler/crawler_lexer.cpp
+++ b/FileCrawler/trunk/fileCrawler/crawler_lexer.cpp
@@ -1706,7 +1706,7 @@ char msg[];
 #endif
 	{
 	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
+	// exit( YY_EXIT_FAILURE );
 	}
 
 
diff --git a/Plugin/clFileSystemWorkspace.cpp b/Plugin/clFileSystemWorkspace.cpp
index 36c91981b4..99b0f04e18 100644
--- a/Plugin/clFileSystemWorkspace.cpp
+++ b/Plugin/clFileSystemWorkspace.cpp
@@ -299,6 +299,9 @@ void clFileSystemWorkspace::RestoreSession()
 
 void clFileSystemWorkspace::DoOpen()
 {
+    // set the working directory to the workspace view
+    ::wxSetWorkingDirectory(GetFileName().GetPath());
+
     // Create the symbols db file
     wxFileName fnFolder(GetFileName());
     fnFolder.SetExt("db");
diff --git a/PreProcessor/fileCrawler/pp_lexer.cpp b/PreProcessor/fileCrawler/pp_lexer.cpp
index 16c0b92ef8..73f3d69b36 100644
--- a/PreProcessor/fileCrawler/pp_lexer.cpp
+++ b/PreProcessor/fileCrawler/pp_lexer.cpp
@@ -2171,7 +2171,7 @@ YY_BUFFER_STATE pp__scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
 static void yy_fatal_error (yyconst char* msg )
 {
     	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
+	// exit( YY_EXIT_FAILURE );
 }
 
 /* Redefine yyless() so it works in section 3 code. */
diff --git a/ScopeOptimizer/ScopeOptimizer/scope_optimizer.cpp b/ScopeOptimizer/ScopeOptimizer/scope_optimizer.cpp
index 6f15462e2b..0d5d21ae6b 100644
--- a/ScopeOptimizer/ScopeOptimizer/scope_optimizer.cpp
+++ b/ScopeOptimizer/ScopeOptimizer/scope_optimizer.cpp
@@ -2320,7 +2320,7 @@ YY_BUFFER_STATE scope_optimizer__scan_bytes  (yyconst char * yybytes, yy_size_t
 static void yy_fatal_error (yyconst char* msg )
 {
     	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
+	// exit( YY_EXIT_FAILURE );
 }
 
 /* Redefine yyless() so it works in section 3 code. */
diff --git a/gdbparser/gdb_result.cpp b/gdbparser/gdb_result.cpp
index 9762e7dc03..2344989b3c 100644
--- a/gdbparser/gdb_result.cpp
+++ b/gdbparser/gdb_result.cpp
@@ -2199,7 +2199,7 @@ YY_BUFFER_STATE gdb_result__scan_bytes  (yyconst char * yybytes, yy_size_t  _yyb
 static void yy_fatal_error (yyconst char* msg )
 {
     	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
+	// exit( YY_EXIT_FAILURE );
 }
 
 /* Redefine yyless() so it works in section 3 code. */