[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2222-gf0f66ce

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  f0f66ce7f644a631bbb5f51f78375298fdef3d40 (commit)
      from  c0e274dbcea978e5a6dc41e3faf3e0196f8660b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=f0f66ce7f644a631bbb5f51f78375298fdef3d40


commit f0f66ce7f644a631bbb5f51f78375298fdef3d40
Author: Nutchanon Wetchasit <address@hidden>
Date:   Wed Sep 23 16:23:18 2015 +0200

    Allow command line switches to override logging verbosity set from 
configuration file.

diff --git a/gui/Player.cpp b/gui/Player.cpp
index 8934598..49bb12a 100644
--- a/gui/Player.cpp
+++ b/gui/Player.cpp
@@ -240,7 +240,10 @@ Player::init_logfile()
 
     dbglogfile.setLogFilename(rcfile.getDebugLog());
 
-    if (rcfile.verbosityLevel() > 0) {
+    // If logging verbosity was already assigned (from command line) to a
+    // non-zero level, leave it intact. Otherwise, use verbosity level from
+    // configuration file (or default one).
+    if (dbglogfile.getVerbosity() == 0) {
         dbglogfile.setVerbosity(rcfile.verbosityLevel());
     }
     

-----------------------------------------------------------------------

Summary of changes:
 gui/Player.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash