From a0d1a7202f4185f14ac60032c753745265869b5f Mon Sep 17 00:00:00 2001 From: Alexis Maiquez Date: Tue, 21 Mar 2023 07:15:38 +0100 Subject: [PATCH] Fixed build of release versions Signed-off-by: Alexis Maiquez --- src/WallpaperEngine/Application/CApplicationContext.cpp | 6 +++--- src/WallpaperEngine/Application/CWallpaperApplication.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/WallpaperEngine/Application/CApplicationContext.cpp b/src/WallpaperEngine/Application/CApplicationContext.cpp index d288c9a..cc65bb1 100644 --- a/src/WallpaperEngine/Application/CApplicationContext.cpp +++ b/src/WallpaperEngine/Application/CApplicationContext.cpp @@ -15,7 +15,7 @@ using namespace WallpaperEngine::Application; struct option long_options [] = { {"screen-root", required_argument, nullptr, 'r'}, {"bg", required_argument, nullptr, 'b'}, - {"window", optional_argument, nullptr, 'w'}, + {"window", required_argument, nullptr, 'w'}, {"pkg", required_argument, nullptr, 'p'}, {"dir", required_argument, nullptr, 'd'}, {"silent", no_argument, nullptr, 's'}, @@ -56,7 +56,7 @@ CApplicationContext::CApplicationContext (int argc, char* argv[]) : std::string lastScreen; - while ((c = getopt_long (argc, argv, "b:r:p:d:shf:a:w::", long_options, nullptr)) != -1) + while ((c = getopt_long (argc, argv, "b:r:p:d:shf:a:w:", long_options, nullptr)) != -1) { switch (c) { @@ -235,7 +235,7 @@ void CApplicationContext::printHelp (const char* route) sLog.out ("\t--silent\t\t\t\t\tMutes all the sound the wallpaper might produce"); sLog.out ("\t--volume \t\t\tSets the volume for all the sounds in the background"); sLog.out ("\t--screen-root \tDisplay as screen's background"); - sLog.out ("\t--window \tRuns in window mode, geometry has to be XxYxWxH"); + sLog.out ("\t--window \tRuns in window mode, geometry has to be XxYxWxH and sets the position and size of the window"); sLog.out ("\t--fps \t\t\tLimits the FPS to the given number, useful to keep battery consumption low"); sLog.out ("\t--assets-dir \t\t\tFolder where the assets are stored"); sLog.out ("\t--screenshot\t\t\t\tTakes a screenshot of the background"); diff --git a/src/WallpaperEngine/Application/CWallpaperApplication.cpp b/src/WallpaperEngine/Application/CWallpaperApplication.cpp index 59590ac..5c5d7c5 100644 --- a/src/WallpaperEngine/Application/CWallpaperApplication.cpp +++ b/src/WallpaperEngine/Application/CWallpaperApplication.cpp @@ -43,7 +43,7 @@ void CWallpaperApplication::setupContainer (CCombinedContainer& container, const #if !NDEBUG container.add (new CDirectory ("../share/")); #else - this->m_vfs.add (new CDirectory (DATADIR)); + container.add (new CDirectory (DATADIR)); #endif /* DEBUG */ // TODO: move this somewhere else?