diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-16 22:17:37 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-16 22:17:37 +0000 |
| commit | cc8b654d062a852b9fa49f97c2232c8a912ae1b7 (patch) | |
| tree | 88f86c68e08a979021051cd64e8a3ee105b12e6f /chromeos | |
| parent | b930c660a552386dd7c9210de42fa63b38205fc6 (diff) | |
| download | chromium_src-cc8b654d062a852b9fa49f97c2232c8a912ae1b7.zip chromium_src-cc8b654d062a852b9fa49f97c2232c8a912ae1b7.tar.gz chromium_src-cc8b654d062a852b9fa49f97c2232c8a912ae1b7.tar.bz2 | |
Fix crash in logging.
BUG=269198
R=derat@chromium.org
Review URL: https://codereview.chromium.org/27571002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/display/output_configurator.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromeos/display/output_configurator.cc b/chromeos/display/output_configurator.cc index ff77c9d..4676246 100644 --- a/chromeos/display/output_configurator.cc +++ b/chromeos/display/output_configurator.cc @@ -427,7 +427,8 @@ bool OutputConfigurator::SetDisplayPower(DisplayPowerState power_state, VLOG(1) << "SetDisplayPower: power_state=" << DisplayPowerStateToString(power_state) << " flags=" << flags << ", configure timer=" - << (configure_timer_->IsRunning() ? "Running" : "Stopped"); + << ((configure_timer_.get() && configure_timer_->IsRunning()) ? + "Running" : "Stopped"); if (power_state == power_state_ && !(flags & kSetDisplayPowerForceProbe)) return true; |