Ticket #6484: mythtv-6484-mythtv-setup-do_not_use_display_for_help.patch
File mythtv-6484-mythtv-setup-do_not_use_display_for_help.patch, 1.3 KB (added by , 15 years ago) |
---|
-
programs/mythtv-setup/main.cpp
old new 124 124 bool use_display = true; 125 125 126 126 #ifdef USING_X11 127 // Remember any -display or -geometry argument 128 // which QApplication init will remove.129 for(int argpos = 1; argpos + 1< argc; ++argpos)127 // Remember any -display or -geometry argument which QApplication init will 128 // remove and unset use_display for command-line usage. 129 for(int argpos = 1; argpos < argc; ++argpos) 130 130 { 131 131 if (!strcmp(argv[argpos],"-geometry")) 132 geometry = argv[argpos+1]; 132 { 133 if (argc-1 > argpos) 134 geometry = argv[argpos+1]; 135 } 133 136 else if (!strcmp(argv[argpos],"-display")) 134 display = argv[argpos+1]; 137 { 138 if (argc-1 > argpos) 139 display = argv[argpos+1]; 140 } 141 else if (!strcmp(argv[argpos],"-h") || 142 !strcmp(argv[argpos],"--help") || 143 !strcmp(argv[argpos],"--usage")) 144 use_display = false; 135 145 else if (QString(argv[argpos]).left(6) == "--scan") 136 146 { 137 147 use_display = false;