summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_frame_automation.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index 9f62523..35f36e7 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -1057,8 +1057,6 @@ void ChromeFrameAutomationClient::AutomationServerDied() {
void ChromeFrameAutomationClient::InitializeComplete(
AutomationLaunchResult result) {
DCHECK_EQ(PlatformThread::CurrentId(), ui_thread_id_);
- std::string version = automation_server_->server_version();
-
if (result != AUTOMATION_SUCCESS) {
DLOG(WARNING) << "InitializeComplete: failure " << result;
ReleaseAutomationServer();
@@ -1081,6 +1079,9 @@ void ChromeFrameAutomationClient::InitializeComplete(
if (result == AUTOMATION_SUCCESS) {
chrome_frame_delegate_->OnAutomationServerReady();
} else {
+ std::string version;
+ if (automation_server_)
+ version = automation_server_->server_version();
chrome_frame_delegate_->OnAutomationServerLaunchFailed(result, version);
}
}