--- swfobject_api.module.orig	2007-10-12 20:24:25.000000000 +0200
+++ swfobject_api.module	2007-12-19 09:29:10.000000000 +0100
@@ -45,4 +45,5 @@ function swfobject_api_menu($may_cache) 
 function swfobject_api_settings_form() {
   $form = array();
+  $settings=variable_get('swfobject_api_settings', array("swfoa_version"=>"6","swfoa_express"=>""));
 
   $form['swfobject_api_settings'] = array(
@@ -55,5 +56,5 @@ function swfobject_api_settings_form() {
     '#title' => t('Default minimum version required'),
     '#description' => t('This value can be overridden via the theme call.'),
-    '#default_value' => variable_get('swfoa_express', '6'),
+    '#default_value' => $settings["swfoa_version"],
     '#required' => TRUE
   );
@@ -62,5 +63,5 @@ function swfobject_api_settings_form() {
     '#title' => t('Enable express install.'),
     '#description' => t('Express install allows player upgrades without having to leave the site. Only versions 6.0.65 and above are supported.'),
-    '#default_value' => variable_get('swfoa_express', ''),
+    '#default_value' => $settings["swfoa_express"],
   );
   $form['submit'] = array('#type' => 'submit', '#value' => t('Save settings'));
@@ -78,4 +79,5 @@ function swfobject_api_settings_form() {
 function theme_swfobject_api($url, $params = null, $vars = null) {
   static $id_count;
+  $settings=variable_get('swfobject_api_settings', array("swfoa_version"=>"6","swfoa_express"=>""));
   
   $path = drupal_get_path('module', 'swfobject_api');
@@ -85,5 +87,5 @@ function theme_swfobject_api($url, $para
     'height' => '100%',
     'no_flash' => t('Sorry, you need to install flash to see this content.'),
-    'version' => variable_get('swfoa_version', '5'),
+    'version' => $settings["swfoa_version"],
     'type' => 'movie',
     'bg_color' => '#FFFFFF'
@@ -140,5 +142,5 @@ function theme_swfobject_api($url, $para
   }
   
-  if (variable_get('swfoa_express', '')) {
+  if ($settings["swfoa_version"]) {
     $html .= " so$id_count.useExpressInstall('". $path ."/expressinstall.swf');\n";
     if (isset($redirect)) {