summaryrefslogtreecommitdiff
path: root/src/modinfo.cpp
diff options
context:
space:
mode:
authorTannin <devnull@localhost>2013-03-13 19:35:20 +0100
committerTannin <devnull@localhost>2013-03-13 19:35:20 +0100
commitb3d0fcb2083143dc21c751adafd2523c3555e5d2 (patch)
tree6adeeedc26848af1d5dd96be17b4bca97ede085d /src/modinfo.cpp
parent93e073c32445eefba5595123b28acf87d9f409e8 (diff)
- some more safety checks in the ini-limit removal code
- some code cleanup and minor bug fixes based on results from static code analysis - added naemfilter for the esp list - bsa changes are now stored automatically but delayed by up to 0.5 seconds (for performance reasons) - bugfix: buffer overrun when certain functions are called with empty file names - bugfix: reroute for the ini-limit fix was placed in the data segment - bugfix: mod list got mixed up when the mod directory was changed externally - bugfix: plugins.txt reroute on skyrim didn't work on winXP - bugfix: MO could become unresponsive if the tutorial script couldn't be interpreted
Diffstat (limited to 'src/modinfo.cpp')
-rw-r--r--src/modinfo.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/modinfo.cpp b/src/modinfo.cpp
index b8ef834f..80f27ccf 100644
--- a/src/modinfo.cpp
+++ b/src/modinfo.cpp
@@ -731,6 +731,9 @@ ModInfoRegular::EConflictType ModInfoRegular::isConflicted() const
overwritten = true;
break;
}
+ } else if (alternatives.size() == 1) {
+ // only alternative is data -> no conflict
+ regular = true;
}
}
}