Skip to content

Temporarily disable "minimize to tray" in the startup phase if the "-min" option is specified #691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Temporarily disable "minimize to tray" in the startup phase if the "-min" option is specified #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d0d696
If the "-min" option is specified (start minimized), temporarily disa…
runeksvendsen Dec 9, 2011
8cbb6ee
When using Qt GUI, move parameter-parsing to start of qt/bitcoin.cpp:…
runeksvendsen Dec 9, 2011
8807000
Don't forget the previous, user-selected value for fMinimizeToTray
runeksvendsen Dec 9, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,10 @@ bool AppInit2(int argc, char* argv[])
//
// Parameters
//
// If Qt is used, parameters are parsed in qt/bitcoin.cpp's main()
#if !defined(QT_GUI)
ParseParameters(argc, argv);
#endif

if (mapArgs.count("-datadir"))
{
Expand Down
6 changes: 6 additions & 0 deletions src/qt/bitcoin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ int main(int argc, char *argv[])
Q_INIT_RESOURCE(bitcoin);
QApplication app(argc, argv);

ParseParameters(argc, argv);

// Load language files for system locale:
// - First load the translator for the base language, without territory
// - Then load the more specific locale translator
Expand Down Expand Up @@ -173,7 +175,11 @@ int main(int argc, char *argv[])
// If -min option passed, start window minimized.
if(GetBoolArg("-min"))
{
// If we minimize to tray in the start-up phase, the GUI cannot be unminimized again
int fMinimizeToTrayTemp = fMinimizeToTray;
fMinimizeToTray = false;
window.showMinimized();
fMinimizeToTray = fMinimizeToTrayTemp;
}
else
{
Expand Down