diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-11-19 22:06:33 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-11-19 22:06:33 +0000 |
| commit | 02731a49221c436aeb630eddda79d1a0d65438f7 (patch) | |
| tree | 2cc64b5c23c9bedb9a15a782e51fc4d519e991a5 | |
| parent | a24d9b0b2ca88899e942049aa174a04024b5387f (diff) | |
| download | hercules-02731a49221c436aeb630eddda79d1a0d65438f7.tar.gz hercules-02731a49221c436aeb630eddda79d1a0d65438f7.tar.bz2 hercules-02731a49221c436aeb630eddda79d1a0d65438f7.tar.xz hercules-02731a49221c436aeb630eddda79d1a0d65438f7.zip | |
* Fixed plug-in version getting checked against itself and a wrong operator being used for the check (bugreport:3952, since r9631).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14467 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/common/plugins.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 7ae626efe..479034a4f 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -7,6 +7,7 @@ Date Added - Fixed usage of 'long long' in strtoull preventing VC6 projects from compiling (bugreport:4059, follow up to r14245). - Made strtoull default to base 10 and actually process base 8, to match the normal behavior of this function (bugreport:4059, follow up to r14245). - Fixed functions in db.c not being returned as pointer, causing warnings on VC6. + * Fixed plug-in version getting checked against itself and a wrong operator being used for the check (bugreport:3952, since r9631). [Ai4rei] 2010/11/16 * Added a missing argument to a warning containing a format specifier. [Paradox924X] 2010/11/15 diff --git a/src/common/plugins.c b/src/common/plugins.c index c6c362de5..2d81548a1 100644 --- a/src/common/plugins.c +++ b/src/common/plugins.c @@ -160,8 +160,8 @@ static int plugin_iscompatible(char* version) if( version == NULL ) return 0; sscanf(version, "%d.%d", &req_major, &req_minor); - sscanf(version, "%d.%d", &major, &minor); - return ( req_major == major || req_minor <= minor ); + sscanf(PLUGIN_VERSION, "%d.%d", &major, &minor); + return ( req_major == major && req_minor <= minor ); } Plugin* plugin_open(const char* filename) |