Merge branch 'stdexcept' of github.com:CendioOssman/tigervnc

1 files changed, 13 insertions, 13 deletions

diff --git a/win/rfb_win32/CleanDesktop.cxx b/win/rfb_win32/CleanDesktop.cxx
index 6d933b22..02fdd374 100644
--- a/win/rfb_win32/CleanDesktop.cxx
+++ b/win/rfb_win32/CleanDesktop.cxx
@@ -45,7 +45,7 @@ struct ActiveDesktop {
     HRESULT result = CoCreateInstance(CLSID_ActiveDesktop, nullptr, CLSCTX_INPROC_SERVER,
                                       IID_IActiveDesktop, (PVOID*)&handle);
     if (result != S_OK)
-      throw rdr::Win32Exception("failed to contact Active Desktop", HRESULT_CODE(result));
+      throw rdr::win32_error("failed to contact Active Desktop", HRESULT_CODE(result));
   }
   ~ActiveDesktop() {
     if (handle)
@@ -173,16 +173,16 @@ void CleanDesktop::disableWallpaper() {
       ActiveDesktop ad;
       if (ad.enable(false))
         restoreActiveDesktop = true;
-    } catch (rdr::Exception& e) {
-      vlog.error("%s", e.str());
+    } catch (std::exception& e) {
+      vlog.error("%s", e.what());
     }
 
     // -=- Switch of normal wallpaper and notify apps
     SysParamsInfo(SPI_SETDESKWALLPAPER, 0, (PVOID) "", SPIF_SENDCHANGE);
     restoreWallpaper = true;
 
-  } catch (rdr::Exception& e) {
-    vlog.info("%s", e.str());
+  } catch (std::exception& e) {
+    vlog.info("%s", e.what());
   }
 }
 
@@ -198,8 +198,8 @@ void CleanDesktop::enableWallpaper() {
         ActiveDesktop ad;
         ad.enable(true);
         restoreActiveDesktop = false;
-      } catch (rdr::Exception& e) {
-        vlog.error("%s", e.str());
+      } catch (std::exception& e) {
+        vlog.error("%s", e.what());
       }
     }
 
@@ -211,8 +211,8 @@ void CleanDesktop::enableWallpaper() {
       restoreWallpaper = false;
     }
 
-  } catch (rdr::Exception& e) {
-    vlog.info("%s", e.str());
+  } catch (std::exception& e) {
+    vlog.info("%s", e.what());
   }
 }
 
@@ -243,8 +243,8 @@ void CleanDesktop::disableEffects() {
     }
     restoreEffects = true;
 
-  } catch (rdr::Exception& e) {
-    vlog.info("%s", e.str());
+  } catch (std::exception& e) {
+    vlog.info("%s", e.what());
   }
 }
 
@@ -268,7 +268,7 @@ void CleanDesktop::enableEffects() {
       restoreEffects = false;
     }
 
-  } catch (rdr::Exception& e) {
-    vlog.info("%s", e.str());
+  } catch (std::exception& e) {
+    vlog.info("%s", e.what());
   }
 }