@ -496,7 +496,7 @@ void BitcoinApplication::shutdownResult(int retval)
void BitcoinApplication : : handleRunawayException ( const QString & message )
void BitcoinApplication : : handleRunawayException ( const QString & message )
{
{
QMessageBox : : critical ( 0 , " Runaway exception " , BitcoinGUI : : tr ( " A fatal error occurred. Bitcoin can no longer continue safely and will quit. " ) + QString ( " \n \n " ) + message ) ;
QMessageBox : : critical ( 0 , " Runaway exception " , BitcoinGUI : : tr ( " A fatal error occurred. Bitcoin can no longer continue safely and will quit. " ) + QString ( " \n \n " ) + message ) ;
: : exit ( 1 ) ;
: : exit ( EXIT_FAILURE ) ;
}
}
WId BitcoinApplication : : getMainWinId ( ) const
WId BitcoinApplication : : getMainWinId ( ) const
@ -573,13 +573,13 @@ int main(int argc, char *argv[])
{
{
HelpMessageDialog help ( NULL , mapArgs . count ( " -version " ) ) ;
HelpMessageDialog help ( NULL , mapArgs . count ( " -version " ) ) ;
help . showOrPrint ( ) ;
help . showOrPrint ( ) ;
return 0 ;
return EXIT_SUCCESS ;
}
}
/// 5. Now that settings and translations are available, ask user for data directory
/// 5. Now that settings and translations are available, ask user for data directory
// User language is set up: pick a data directory
// User language is set up: pick a data directory
if ( ! Intro : : pickDataDirectory ( ) )
if ( ! Intro : : pickDataDirectory ( ) )
return 0 ;
return EXIT_SUCCESS ;
/// 6. Determine availability of data directory and parse bitcoin.conf
/// 6. Determine availability of data directory and parse bitcoin.conf
/// - Do not call GetDataDir(true) before this step finishes
/// - Do not call GetDataDir(true) before this step finishes
@ -587,14 +587,14 @@ int main(int argc, char *argv[])
{
{
QMessageBox : : critical ( 0 , QObject : : tr ( PACKAGE_NAME ) ,
QMessageBox : : critical ( 0 , QObject : : tr ( PACKAGE_NAME ) ,
QObject : : tr ( " Error: Specified data directory \" %1 \" does not exist. " ) . arg ( QString : : fromStdString ( mapArgs [ " -datadir " ] ) ) ) ;
QObject : : tr ( " Error: Specified data directory \" %1 \" does not exist. " ) . arg ( QString : : fromStdString ( mapArgs [ " -datadir " ] ) ) ) ;
return 1 ;
return EXIT_FAILURE ;
}
}
try {
try {
ReadConfigFile ( GetArg ( " -conf " , BITCOIN_CONF_FILENAME ) , mapArgs , mapMultiArgs ) ;
ReadConfigFile ( GetArg ( " -conf " , BITCOIN_CONF_FILENAME ) , mapArgs , mapMultiArgs ) ;
} catch ( const std : : exception & e ) {
} catch ( const std : : exception & e ) {
QMessageBox : : critical ( 0 , QObject : : tr ( PACKAGE_NAME ) ,
QMessageBox : : critical ( 0 , QObject : : tr ( PACKAGE_NAME ) ,
QObject : : tr ( " Error: Cannot parse configuration file: %1. Only use key=value syntax. " ) . arg ( e . what ( ) ) ) ;
QObject : : tr ( " Error: Cannot parse configuration file: %1. Only use key=value syntax. " ) . arg ( e . what ( ) ) ) ;
return 1 ;
return EXIT_FAILURE ;
}
}
/// 7. Determine network (and switch to network specific options)
/// 7. Determine network (and switch to network specific options)
@ -608,7 +608,7 @@ int main(int argc, char *argv[])
SelectParams ( ChainNameFromCommandLine ( ) ) ;
SelectParams ( ChainNameFromCommandLine ( ) ) ;
} catch ( std : : exception & e ) {
} catch ( std : : exception & e ) {
QMessageBox : : critical ( 0 , QObject : : tr ( PACKAGE_NAME ) , QObject : : tr ( " Error: %1 " ) . arg ( e . what ( ) ) ) ;
QMessageBox : : critical ( 0 , QObject : : tr ( PACKAGE_NAME ) , QObject : : tr ( " Error: %1 " ) . arg ( e . what ( ) ) ) ;
return 1 ;
return EXIT_FAILURE ;
}
}
# ifdef ENABLE_WALLET
# ifdef ENABLE_WALLET
// Parse URIs on command line -- this can affect Params()
// Parse URIs on command line -- this can affect Params()
@ -630,7 +630,7 @@ int main(int argc, char *argv[])
// - Do this after creating app and setting up translations, so errors are
// - Do this after creating app and setting up translations, so errors are
// translated properly.
// translated properly.
if ( PaymentServer : : ipcSendCommandLine ( ) )
if ( PaymentServer : : ipcSendCommandLine ( ) )
exit ( 0 ) ;
exit ( EXIT_SUCCESS ) ;
// Start up the payment server early, too, so impatient users that click on
// Start up the payment server early, too, so impatient users that click on
// bitcoin: links repeatedly have their payment requests routed to this process:
// bitcoin: links repeatedly have their payment requests routed to this process: