Fixes #54

osqp · Mar 27, 2018 · 370dd33 · 370dd33
1 parent 81412c0
commit 370dd33
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 Changes since last release
 --------------------------
+* Fixed [#54](https://github.com/oxfordcontrol/osqp/issues/54).
+
 
 Version 0.3.0 (5 March 2018)
 ----------------------------

diff --git a/src/osqp.c b/src/osqp.c
@@ -281,6 +281,14 @@ c_int osqp_solve(OSQPWorkspace *work) {
   c_int can_print;             // Boolean whether you can print
 #endif /* ifdef PRINTING */
 
+  // Check if workspace has been initialized
+  if (!work) {
+#ifdef PRINTING
+    c_eprint("Workspace not initialized");
+#endif /* ifdef PRINTING */
+    return -1;
+  }
+
   // Initialize variables
   exitflag              = 0;
   can_check_termination = 0;
@@ -298,13 +306,6 @@ c_int osqp_solve(OSQPWorkspace *work) {
 #endif /* ifdef PRINTING */
 
 
-  // Check if workspace has been initialized
-  if (!work) {
-#ifdef PRINTING
-    c_eprint("Workspace not initialized");
-#endif /* ifdef PRINTING */
-    return -1;
-  }
 
 #ifdef PROFILING
   tic(work->timer); // Start timer