From 052c82162509884aeba6d46955d162fe837b529b Mon Sep 17 00:00:00 2001
From: Walt Gribben <waltg@speakeasy.net>
Date: Thu, 27 Apr 2006 05:48:21 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=10035
---
 checkin_notes        | 6 ++++++
 lib/gui_rpc_client.h | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index ea10f5c8e8..f71100bdc9 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -4200,3 +4200,9 @@ Rom    25 Apr 2006
 
     html/user/
         forum_thread.php
+
+Walt   25 Apr 2006
+    - Bug Fix: Save local copy of locale so it gets restored properly later.
+
+    lib/
+        gui_rpc_client.h
diff --git a/lib/gui_rpc_client.h b/lib/gui_rpc_client.h
index 3ddd360f0e..1668f5bd95 100644
--- a/lib/gui_rpc_client.h
+++ b/lib/gui_rpc_client.h
@@ -617,12 +617,12 @@ struct RPC {
 };
 
 struct SET_LOCALE {
-    char* locale;
+    std::string locale;
     inline SET_LOCALE() {
         locale = setlocale(LC_ALL, NULL);
         setlocale(LC_ALL, "C");
     }
     inline ~SET_LOCALE() {
-        setlocale(LC_ALL, locale);
+        setlocale(LC_ALL, locale.c_str());
     }
 };