diff options
| author | John Wiegley <johnw@newartisans.com> | 2013-04-29 16:36:29 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2013-04-29 16:36:29 -0500 |
| commit | 59550b7f66c31592160749c5177074f63d19fa9d (patch) | |
| tree | 0b28be9ab403e67d042f74ae9d1d76d885486b18 /src/main.cc | |
| parent | 385cbd25b9905b16a4c7723bb4e5a5813e84aab0 (diff) | |
| parent | 6bef247759acbdc026624e78d0fd78297bc79501 (diff) | |
| download | fork-ledger-59550b7f66c31592160749c5177074f63d19fa9d.tar.gz fork-ledger-59550b7f66c31592160749c5177074f63d19fa9d.tar.bz2 fork-ledger-59550b7f66c31592160749c5177074f63d19fa9d.zip | |
Merge branch 'next'
Diffstat (limited to 'src/main.cc')
| -rw-r--r-- | src/main.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main.cc b/src/main.cc index a1ac0339..accae197 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2012, John Wiegley. All rights reserved. + * Copyright (c) 2003-2013, John Wiegley. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -59,6 +59,7 @@ int main(int argc, char * argv[], char * envp[]) // --debug CATEGORY ; turns on debug logging // --trace LEVEL ; turns on trace logging // --memory ; turns on memory usage tracing + // --init-file ; directs ledger to use a different init file handle_debug_options(argc, argv); #if VERIFY_ON IF_VERIFY() initialize_memory_tracing(); @@ -213,7 +214,8 @@ int main(int argc, char * argv[], char * envp[]) } else #endif { - global_scope->quick_close(); + if (global_scope) + global_scope->quick_close(); INFO("Ledger ended"); // let global_scope leak! } |