diff --git a/src/menu.cpp b/src/menu.cpp index 1e0baff..3711bdc 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #ifdef HAVE_LIBOPK @@ -80,8 +79,23 @@ Menu::Menu(GMenu2X *gmenu2x, Touchscreen &ts) readLinks(); #ifdef HAVE_LIBOPK - std::thread t(&Menu::openAllPackages, this); - t.detach(); + { + struct dirent *dptr; + DIR *dirp = opendir(CARD_ROOT); + if (dirp) { + while ((dptr = readdir(dirp))) { + if (dptr->d_type != DT_DIR) + continue; + + if (!strcmp(dptr->d_name, ".") || !strcmp(dptr->d_name, "..")) + continue; + + openPackagesFromDir((string) CARD_ROOT + "/" + + dptr->d_name + "/apps"); + } + closedir(dirp); + } + } #endif orderLinks(); @@ -98,27 +112,6 @@ Menu::~Menu() { delete *it; } -#ifdef HAVE_LIBOPK -void Menu::openAllPackages(void) -{ - struct dirent *dptr; - DIR *dirp = opendir(CARD_ROOT); - if (dirp) { - while ((dptr = readdir(dirp))) { - if (dptr->d_type != DT_DIR) - continue; - - if (!strcmp(dptr->d_name, ".") || !strcmp(dptr->d_name, "..")) - continue; - - openPackagesFromDir((string) CARD_ROOT + "/" + - dptr->d_name + "/apps"); - } - closedir(dirp); - } -} -#endif - void Menu::readSections(std::string parentDir) { DIR *dirp; @@ -758,7 +751,6 @@ void Menu::readPackages(std::string parentDir) } openPackage(parentDir + '/' + dptr->d_name, false); - inject_user_event(); // Notify the InputManager for a repaint } closedir(dirp); diff --git a/src/menu.h b/src/menu.h index cf4be93..c4e5c09 100644 --- a/src/menu.h +++ b/src/menu.h @@ -105,7 +105,6 @@ public: #ifdef HAVE_LIBOPK void openPackage(std::string path, bool order = true); void openPackagesFromDir(std::string path); - void openAllPackages(void); #ifdef ENABLE_INOTIFY void removePackageLink(std::string path); #endif