2 files changed, 10 insertions, 8 deletions

diff --git a/toxav/toxav.c b/toxav/toxav.c
index 4c2cb4ef..7a883cf2 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -121,10 +121,11 @@ uint32_t toxav_version_patch(void)
 
 bool toxav_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch)
 {
-    if (major != TOXAV_VERSION_MAJOR)
-        return 0;
-    else
-        return 1;
+  return (TOXAV_VERSION_MAJOR == major && /* Force the major version */
+            (TOXAV_VERSION_MINOR > minor || /* Current minor version must be newer than requested  -- or -- */
+                (TOXAV_VERSION_MINOR == minor && TOX_VERSION_PATCH >= patch) /* the patch must be the same or newer */
+            )
+         )
 }
 
 ToxAV *toxav_new(Tox *tox, TOXAV_ERR_NEW *error)
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 3a9c4481..677fd112 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -87,10 +87,11 @@ uint32_t tox_version_patch(void)
 
 bool tox_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch)
 {
-    if (major != TOX_VERSION_MAJOR)
-        return 0;
-    else
-        return 1;
+  return (TOX_VERSION_MAJOR == major && /* Force the major version */
+            (TOX_VERSION_MINOR > minor || /* Current minor version must be newer than requested -- or -- */
+                (TOX_VERSION_MINOR == minor && TOX_VERSION_PATCH >= patch) /* the patch must be the same or newer */
+            )
+         )
 }