47.4 RC release. Previous RC crashed on WinXP (Issue #180).

cztomczak · Feb 12, 2016 · 7802ead · 7802ead
1 parent 107e293
commit 7802ead
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/phpdesktop-chrome47/cef/browser_window.cpp b/phpdesktop-chrome47/cef/browser_window.cpp
@@ -123,13 +123,12 @@ Fullscreen* BrowserWindow::GetFullscreenObject() {
 void BrowserWindow::SetCefBrowser(CefRefPtr<CefBrowser> cefBrowser) {
     // Called from ClientHandler::OnAfterCreated().
     _ASSERT(!cefBrowser_.get());
-    if (cefBrowser_) {
+    if (cefBrowser_.get()) {
         LOG_ERROR << "BrowserWindow::SetCefBrowser() called, "
                   << "but it is already set";
         return;
     }
     cefBrowser_ = cefBrowser;
-    browserHandle_ = cefBrowser->GetHost()->GetWindowHandle();
     fullscreen_.reset(new Fullscreen(cefBrowser));
     json_value* appSettings = GetApplicationSettings();
     if (!IsPopup()) {
@@ -215,7 +214,11 @@ void BrowserWindow::OnGetMinMaxInfo(UINT uMsg, WPARAM wParam, LPARAM lParam) {
     }
 }
 void BrowserWindow::OnSize() {
-    if (browserHandle_) {
+    if (cefBrowser_.get()) {
+        HWND browserHandle_ = cefBrowser_->GetHost()->GetWindowHandle();
+        if (!browserHandle_) {
+            return;
+        }
         RECT rect;
         GetClientRect(windowHandle_, &rect);
         HDWP hdwp = BeginDeferWindowPos(2);

diff --git a/phpdesktop-chrome47/cef/browser_window.h b/phpdesktop-chrome47/cef/browser_window.h
@@ -22,7 +22,6 @@ int CountBrowserWindows();
 class BrowserWindow {
 private:
     HWND windowHandle_;
-    HWND browserHandle_;
     bool isPopup_;
 	CefRefPtr<CefBrowser> cefBrowser_; // may be empty, always check using .get()
     std::tr1::shared_ptr<Fullscreen> fullscreen_; // may be empty

diff --git a/phpdesktop-chrome47/resource.rc b/phpdesktop-chrome47/resource.rc
@@ -47,8 +47,8 @@ IDR_MAINWINDOW          ICON                    "icon.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 47,3,0,0
- PRODUCTVERSION 47,3,0,0
+ FILEVERSION 47,4,0,0
+ PRODUCTVERSION 47,4,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "PHP Desktop"
             VALUE "FileDescription", "PHP Desktop Chrome"
-            VALUE "FileVersion", "47.3.0.0"
+            VALUE "FileVersion", "47.4.0.0"
             VALUE "InternalName", "phpdesktop"
             VALUE "LegalCopyright", "(c) Czarek Tomczak 2012"
             VALUE "OriginalFilename", "phpdesktop-chrome.exe"
             VALUE "ProductName", "PHP Desktop Chrome"
-            VALUE "ProductVersion", "47.3.0.0"
+            VALUE "ProductVersion", "47.4.0.0"
         END
     END
     BLOCK "VarFileInfo"