Update libmimeapps, fixes OtterBrowser#1030

JZ-arch · Dec 31, 2015 · bf53daf · bf53daf
1 parent 3fb3bce
commit bf53daf
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/3rdparty/libmimeapps/Index.cpp b/3rdparty/libmimeapps/Index.cpp
@@ -257,7 +257,22 @@ void Index::removeFromType(const std::string &type, const std::string &entryId)
  {
  if (*it == type)
  {
- types.erase(it);
+ if (it == types.begin())
+ {
+ types.erase(it);
+
+ it = types.begin();
+ }
+ else
+ {
+ std::vector<std::string>::iterator temp = it;
+ --temp;
+
+ types.erase(it);
+
+ it = ++temp;
+ }
+
  }
  else
  {
@@ -271,13 +286,17 @@ void Index::removeUnused()
 {
  std::map<std::string, DesktopEntry*>::iterator application;
 
- for (application = knownApplications_.begin(); application != knownApplications_.end(); ++application)
+ for (application = knownApplications_.begin(); application != knownApplications_.end();)
  {
  if (application->second->types().empty())
  {
  delete application->second;
 
- knownApplications_.erase(application);
+ knownApplications_.erase(application++);
+ }
+ else
+ {
+ ++application;
  }
  }
 }

diff --git a/3rdparty/libmimeapps/Tools.cpp b/3rdparty/libmimeapps/Tools.cpp
@@ -78,7 +78,7 @@ std::vector<std::string> split(const std::string &str, char delim)
 
 bool match(std::string const& text, std::string const& pattern)
 {
- return std::search(text.begin(), text.end(),  pattern.begin(), pattern.end() ) != text.end();
+ return std::search(text.begin(), text.end(), pattern.begin(), pattern.end()) != text.end();
 }
 
 std::vector<file> directoryEntries(const std::string &directory)