3 files changed, 15 insertions, 7 deletions

diff --git a/cpp/examples/solve_h48h3k2.cpp b/cpp/examples/solve_h48h3k2.cpp
index 7f06376..f7ba235 100644
--- a/cpp/examples/solve_h48h3k2.cpp
+++ b/cpp/examples/solve_h48h3k2.cpp
@@ -68,7 +68,7 @@ int main() {
 
         // Solve
         auto solve_result = h48h3k2.solve(c, nissy::nissflag::NORMAL,
-            0, maxmoves, 1, -1, 8);
+            0, maxmoves, 1, 20, 8);
 
         // Write the result
         if (!solve_result.err.ok()) {
diff --git a/cpp/nissy.cpp b/cpp/nissy.cpp
index 944944b..92b10bd 100644
--- a/cpp/nissy.cpp
+++ b/cpp/nissy.cpp
@@ -21,8 +21,8 @@ extern "C" {
         long long nissy_gendata(const char *, unsigned long long, char *);
         long long nissy_checkdata(unsigned long long, const char *);
         long long nissy_solve(const char *, const char *, unsigned, unsigned,
-            unsigned, unsigned, int, int, unsigned long long, const char *,
-            unsigned, char *, long long *);
+            unsigned, unsigned, unsigned, unsigned, unsigned long long,
+            const char *, unsigned, char *, long long *);
         long long nissy_countmoves(const char *);
         long long nissy_setlogger(void (*)(const char *, void *), void *);
 }
@@ -182,11 +182,19 @@ namespace nissy {
 
         solver::solve_result
         solver::solve(const cube& cube, nissflag niss, unsigned minmoves,
-            unsigned maxmoves, unsigned maxsols, int optimal, int threads)
+            unsigned maxmoves, unsigned maxsols, unsigned optimal,
+            unsigned threads)
         {
+                solver::solve_result result;
+
+                if (maxsols == 0) {
+                        result.solutions = {};
+                        result.err = error::OK;
+                        return result;
+                }
+
                 const size_t len = 3 * (maxmoves+1) * maxsols;
                 std::vector<char> csols(len);
-                solver::solve_result result;
 
                 auto err = nissy_solve(cube.to_string().c_str(),
                     name.c_str(), niss.value, minmoves, maxmoves, maxsols,
diff --git a/cpp/nissy.h b/cpp/nissy.h
index db8ba5f..4b9c1c9 100644
--- a/cpp/nissy.h
+++ b/cpp/nissy.h
@@ -91,8 +91,8 @@ namespace nissy {
                 error check_data();
                 void unload_data();
                 solve_result solve(const cube&, nissflag, unsigned minmoves,
-                    unsigned maxmoves, unsigned maxsols, int optimal,
-                    int threads);
+                    unsigned maxmoves, unsigned maxsols, unsigned optimal,
+                    unsigned threads);
 
                 static std::variant<solver, error> get(const std::string&);
         private: