From 328b6e77108170dbd48b4d3b0c7ac6dd78e2a470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= <capelle.mikael@gmail.com>
Date: Wed, 27 Sep 2023 20:22:34 +0200
Subject: [PATCH] Fix arity check for function arguments.

---
 src/mobase/wrappers/basic_classes.cpp | 6 +++---
 src/pybind11-utils/functional.cpp     | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/mobase/wrappers/basic_classes.cpp b/src/mobase/wrappers/basic_classes.cpp
index 26e1ddb..2ca20b0 100644
--- a/src/mobase/wrappers/basic_classes.cpp
+++ b/src/mobase/wrappers/basic_classes.cpp
@@ -554,12 +554,12 @@ namespace mo2::python {
                  py::return_value_policy::reference)
 
             .def("onAboutToRun",
-                 py::overload_cast<std::function<bool(QString const&)> const&>(
+                 py::overload_cast<std::function<bool(QString const&, const QDir&,
+                                                      const QString&)> const&>(
                      &IOrganizer::onAboutToRun),
                  "callback"_a)
             .def("onAboutToRun",
-                 py::overload_cast<std::function<bool(QString const&, const QDir&,
-                                                      const QString&)> const&>(
+                 py::overload_cast<std::function<bool(QString const&)> const&>(
                      &IOrganizer::onAboutToRun),
                  "callback"_a)
             .def("onFinishedRun", &IOrganizer::onFinishedRun, "callback"_a)
diff --git a/src/pybind11-utils/functional.cpp b/src/pybind11-utils/functional.cpp
index 4128885..4cc7b6c 100644
--- a/src/pybind11-utils/functional.cpp
+++ b/src/pybind11-utils/functional.cpp
@@ -21,7 +21,8 @@ namespace mo2::python::detail {
         auto required_count = args_count - defaults_count;
 
         return required_count <= arity  // cannot require more parameters than given,
-               && (args_count >= arity || varargs);  // must accept enough parameters.
+               && (args_count >= arity ||
+                   !varargs.is_none());  // must accept enough parameters.
     }
 
 }  // namespace mo2::python::detail