mirror of
https://github.com/Almamu/linux-wallpaperengine.git
synced 2025-09-14 13:56:48 +08:00
~ Fix issue #66, command-line parameters were not parsed properly
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
This commit is contained in:
parent
6ec5770660
commit
a66bc26f1d
10
main.cpp
10
main.cpp
@ -62,8 +62,6 @@ int main (int argc, char* argv[])
|
|||||||
bool shouldEnableAudio = true;
|
bool shouldEnableAudio = true;
|
||||||
std::string path;
|
std::string path;
|
||||||
|
|
||||||
int option_index = 0;
|
|
||||||
|
|
||||||
static struct option long_options [] = {
|
static struct option long_options [] = {
|
||||||
{"screen-root", required_argument, 0, 'r'},
|
{"screen-root", required_argument, 0, 'r'},
|
||||||
{"pkg", required_argument, 0, 'p'},
|
{"pkg", required_argument, 0, 'p'},
|
||||||
@ -76,7 +74,7 @@ int main (int argc, char* argv[])
|
|||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
int c = getopt_long (argc, argv, "r:p:d:shf:", long_options, &option_index);
|
int c = getopt_long (argc, argv, "r:p:d:shf:", long_options, nullptr);
|
||||||
|
|
||||||
if (c == -1)
|
if (c == -1)
|
||||||
break;
|
break;
|
||||||
@ -111,13 +109,13 @@ int main (int argc, char* argv[])
|
|||||||
}
|
}
|
||||||
|
|
||||||
// increment the option index (useful for when no options were found)
|
// increment the option index (useful for when no options were found)
|
||||||
option_index ++;
|
// option_index ++;
|
||||||
|
|
||||||
if (path.empty () == true)
|
if (path.empty () == true)
|
||||||
{
|
{
|
||||||
if (option_index < argc && strlen (argv [option_index]) > 0)
|
if (optind < argc && strlen (argv [optind]) > 0)
|
||||||
{
|
{
|
||||||
path = argv [option_index];
|
path = argv [optind];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user