3 files changed, 7 insertions, 7 deletions
diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp
index c8263ad..e86255b 100644
--- a/src/aooptionsdialog.cpp
+++ b/src/aooptionsdialog.cpp
@@ -341,7 +341,7 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
     ui_audio_layout->setWidget(9, QFormLayout::LabelRole, ui_objectmusic_lbl);
 
     ui_objectmusic_cb = new QCheckBox(ui_audio_widget);
-    ui_objectmusic_cb->setChecked(p_ao_app->get_objectmusic());
+    ui_objectmusic_cb->setChecked(p_ao_app->objection_stop_music());
 
     ui_audio_layout->setWidget(9, QFormLayout::FieldRole, ui_objectmusic_cb);
 
@@ -517,7 +517,7 @@ void AOOptionsDialog::save_pressed()
     configini->setValue("default_blip", ui_blips_volume_spinbox->value());
     configini->setValue("blip_rate", ui_bliprate_spinbox->value());
     configini->setValue("blank_blip", ui_blank_blips_cb->isChecked());
-    configini->setValue("kill_music_on_object", ui_objectmusic_cb->isChecked());
+    configini->setValue("objection_stop_music", ui_objectmusic_cb->isChecked());
 
     configini->setValue("casing_enabled", ui_casing_enabled_cb->isChecked());
     configini->setValue("casing_defence_enabled", ui_casing_def_cb->isChecked());
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 276b0fa..cd51004 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -1336,7 +1336,7 @@ void Courtroom::handle_chatmessage(QStringList *p_contents)
     case 2:
       ui_vp_objection->play("objection", f_char, f_custom_theme, 724);
       objection_player->play("objection.wav", f_char, f_custom_theme);
-      if (ao_app->get_objectmusic())
+      if (ao_app->objection_stop_music())
           music_player->play(""); //I'd prefer if this sent a networked message instead so everyone would have their music cut when you object.
       break;
     case 3:
diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp
index 026de16..9a0cd2f 100644
--- a/src/text_file_functions.cpp
+++ b/src/text_file_functions.cpp
@@ -8,7 +8,7 @@ QString AOApplication::read_theme()
 
 int AOApplication::read_blip_rate()
 {
-  int result = configini->value("blip_rate", 1).toInt();
+  int result = configini->value("blip_rate", 2).toInt();
 
   if (result < 1)
     return 1;
@@ -48,7 +48,7 @@ int AOApplication::get_max_log_size()
 
 bool AOApplication::get_log_goes_downwards()
 {
-  QString result = configini->value("log_goes_downwards", "false").value<QString>();
+  QString result = configini->value("log_goes_downwards", "true").value<QString>();
   return result.startsWith("true");
 }
 
@@ -602,9 +602,9 @@ bool AOApplication::get_blank_blip()
     return result.startsWith("true");
 }
 
-bool AOApplication::get_objectmusic()
+bool AOApplication::objection_stop_music()
 {
-    QString result = configini->value("kill_music_on_object", "true").value<QString>();
+    QString result = configini->value("objection_stop_music", "false").value<QString>();
     return result.startsWith("true");
 }