From 650cb1d41d13378ea2891d50f607f5f3abb05987 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Thu, 6 Jan 2011 19:37:10 +0000
Subject: [PATCH] Fix use of the default error text when returning RV_CONTINUE
 from HandleLoadError (issue #161).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@156 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 libcef/browser_webview_delegate.cc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/libcef/browser_webview_delegate.cc b/libcef/browser_webview_delegate.cc
index 9caf910b6..4f2baccc4 100644
--- a/libcef/browser_webview_delegate.cc
+++ b/libcef/browser_webview_delegate.cc
@@ -696,17 +696,20 @@ void BrowserWebViewDelegate::didFailProvisionalLoad(
   }
 
   std::string error_text;
+  CefString errorStr;
 
   CefRefPtr<CefHandler> handler = browser_->GetHandler();
+  CefHandler::RetVal rv = RV_CONTINUE;
   if(handler.get()) {
     // give the handler an opportunity to generate a custom error message
-    CefString errorStr;
-    CefHandler::RetVal rv = handler->HandleLoadError(browser_,
+    rv = handler->HandleLoadError(browser_,
         browser_->GetCefFrame(frame),
         static_cast<CefHandler::ErrorCode>(error.reason),
         std::string(failed_ds->request().url().spec().data()), errorStr);
-    if(rv == RV_HANDLED && !errorStr.empty())
-      error_text = errorStr;
+  }
+    
+  if(rv == RV_HANDLED && !errorStr.empty()) {
+    error_text = errorStr;
   } else {
     error_text = StringPrintf("Error %d when loading url %s",
         error.reason, failed_ds->request().url().spec().data());