Don't throw an exception if user has disabled SharedObjects

diff --git a/net/systemeD/potlatch2/BackgroundSelector.mxml b/net/systemeD/potlatch2/BackgroundSelector.mxml
index 2259c6b20d23bb2e8a1025a0dc2ceac391308e5a..6ca5c8552f057edc06f750b4d56929737f10ee52 100644 (file)
--- a/net/systemeD/potlatch2/BackgroundSelector.mxml
+++ b/net/systemeD/potlatch2/BackgroundSelector.mxml
@@ -48,13 +48,13 @@
                        FlexGlobals.topLevelApplication.theMap.setDimming(dim.selected);
                        var obj:SharedObject=SharedObject.getLocal("user_state","/");
                        obj.setProperty('background_dim',v);
-                       obj.flush();
+                       try { obj.flush(); } catch (e:Error) {}
                }
                public function setSharpen(v:Boolean):void {
                        FlexGlobals.topLevelApplication.theMap.setSharpen(sharpen.selected);
                        var obj:SharedObject=SharedObject.getLocal("user_state","/");
                        obj.setProperty('background_sharpen',v);
-                       obj.flush();
+                       try { obj.flush(); } catch (e:Error) {}
                }
     ]]></fx:Script>
 </s:BorderContainer>

diff --git a/net/systemeD/potlatch2/FunctionKeyManager.as b/net/systemeD/potlatch2/FunctionKeyManager.as
index 03165b81fbec2c25745a96443d94f2ab01d7615d..494ce6112794a60cc84fdabf01571f4dc3f22686 100644 (file)
--- a/net/systemeD/potlatch2/FunctionKeyManager.as
+++ b/net/systemeD/potlatch2/FunctionKeyManager.as
@@ -44,7 +44,7 @@ package net.systemeD.potlatch2 {
                        keys[fkey]={ code:code, value:value };
                        var obj:SharedObject=SharedObject.getLocal("user_state","/");
                        obj.setProperty('F'+fkey,{ code:code, value:value });
-                       obj.flush();
+                       try { obj.flush(); } catch (e:Error) {}
                        dispatchEvent(new Event("key_changed"));
                }
 
@@ -54,7 +54,7 @@ package net.systemeD.potlatch2 {
                                keys[Number(oldKey.substr(1))]=null;
                                var obj:SharedObject=SharedObject.getLocal("user_state","/");
                                obj.setProperty(oldKey,null);
-                               obj.flush();
+                               try { obj.flush(); } catch (e:Error) {}
                        } else {
                                setKey(Number(key.substr(1)),code,value);
                        }

diff --git a/net/systemeD/potlatch2/Toolbox.mxml b/net/systemeD/potlatch2/Toolbox.mxml
index 1826e26163149ffd7b50577d69ad99eba0736203..a5a59f336ecca1b030e7245d530260d296f17aaa 100644 (file)
--- a/net/systemeD/potlatch2/Toolbox.mxml
+++ b/net/systemeD/potlatch2/Toolbox.mxml
@@ -142,7 +142,7 @@
                        this.visible=!this.visible;
                        var obj:SharedObject = SharedObject.getLocal("user_state","/");
                        obj.setProperty("toolbox_visible",this.visible);
-                       obj.flush();
+                       try { obj.flush(); } catch (e:Error) {}
                }
                
                // --------------------------------------------------------------------------------

diff --git a/net/systemeD/potlatch2/collections/Imagery.as b/net/systemeD/potlatch2/collections/Imagery.as
index 81b4a4a13fa306844ee4cb8717a738cea8bdef74..376f56a597697982ae7620adacde334d63f30d19 100644 (file)
--- a/net/systemeD/potlatch2/collections/Imagery.as
+++ b/net/systemeD/potlatch2/collections/Imagery.as
@@ -151,7 +151,7 @@ package net.systemeD.potlatch2.collections {
                        var obj:SharedObject = SharedObject.getLocal("user_state","/");
                        obj.setProperty('background_url' ,String(bg.url));
                        obj.setProperty('background_name',String(bg.name));
-                       obj.flush();
+                       try { obj.flush(); } catch (e:Error) {}
                }
                
                public function get selected():Object { return _selected; }

diff --git a/net/systemeD/potlatch2/collections/Stylesheets.as b/net/systemeD/potlatch2/collections/Stylesheets.as
index 4ae8973a91a438aab5390180b5035255cf54ce05..94fe417d968e19889cd4f2a81967671b7aae9743 100644 (file)
--- a/net/systemeD/potlatch2/collections/Stylesheets.as
+++ b/net/systemeD/potlatch2/collections/Stylesheets.as
@@ -90,7 +90,7 @@ package net.systemeD.potlatch2.collections {
                        var obj:SharedObject = SharedObject.getLocal("user_state","/");
                        obj.setProperty("stylesheet_url",ss.url);
                        obj.setProperty("stylesheet_name",ss.name);
-                       obj.flush();
+                       try { obj.flush(); } catch (e:Error) {}
                }
 
                /** The currently selected stylesheet */

diff --git a/net/systemeD/potlatch2/dialogs/OptionsDialog.mxml b/net/systemeD/potlatch2/dialogs/OptionsDialog.mxml
index c75fe08535a041382870ea913a5ef27378d20e4a..18707015be75f09ff935a6f8cf946281dc8481c8 100644 (file)
--- a/net/systemeD/potlatch2/dialogs/OptionsDialog.mxml
+++ b/net/systemeD/potlatch2/dialogs/OptionsDialog.mxml
@@ -81,12 +81,12 @@
         FlexGlobals.topLevelApplication.theMap.redraw();
 
         userState.setProperty("tiger_highlighted",tigercheck.selected);
-        userState.flush();
+        try { userState.flush(); } catch (e:Error) {}
     }
 
        private function simplifySet():void {
         userState.setProperty("simplify_tolerance",simplifyslider.value*0.00001);
-        userState.flush();
+        try { userState.flush(); } catch (e:Error) {}
        }
 
        private function licenceToggle():void {

diff --git a/net/systemeD/potlatch2/save/SaveManager.as b/net/systemeD/potlatch2/save/SaveManager.as
index 931c4074d14abbfe18b2f30feea94a6dbab0e4fe..60ff4ab7f79d715a00712f422d35581653815a11 100644 (file)
--- a/net/systemeD/potlatch2/save/SaveManager.as
+++ b/net/systemeD/potlatch2/save/SaveManager.as
@@ -44,7 +44,7 @@ package net.systemeD.potlatch2.save {
                     var obj:SharedObject = SharedObject.getLocal("access_token","/");
                     obj.setProperty("oauth_token", accessToken.key);
                     obj.setProperty("oauth_token_secret", accessToken.secret);
-                    obj.flush();
+                    try { obj.flush(); } catch (e:Error) {}
                 }
                 onCompletion();
             }

diff --git a/potlatch2.mxml b/potlatch2.mxml
index 76245e4ac2326cdc9e48cfe204b0fc494c8b01f3..1fcdf2597d1e80c665d7262433d06ebe83f077ea 100644 (file)
--- a/potlatch2.mxml
+++ b/potlatch2.mxml
@@ -184,7 +184,7 @@
                                obj.setProperty('stylesheet_name','Custom');
                                objChanged=true; 
                        }
-                       if (objChanged) { obj.flush(); }
+                       if (objChanged) { try { obj.flush(); } catch (e:Error) {} }
 
                        // map backdrop object
             var w:uint = map_area.width;