Fix room config updates

9 years ago · 4a4b1dbf2e
parent dd93818f53
commit 4a4b1dbf2e
1 changed files with 6 additions and 4 deletions
--- a/vroom.pl
+++ b/vroom.pl
@ -427,12 +427,14 @@ helper modify_room => sub {
      ($room->{max_members} > $config->{'rooms.max_members'} && $config->{'rooms.max_members'} > 0)){
    $room->{max_members} = 0;
  }
-  if ((!$room->{locked}       || $room->{locked}       !~ m/^0|1$/) ||
-      (!$room->{ask_for_name} || $room->{ask_for_name} !~ m/^0|1$/) ||
-      (!$room->{persistent}   || $room->{persistent}   !~ m/^0|1$/) ||
-        $room->{max_members}  !~ m/^\d+$/){
+  if (($room->{locked}       && $room->{locked}       !~ m/^0|1$/) ||
+      ($room->{ask_for_name} && $room->{ask_for_name} !~ m/^0|1$/) ||
+      ($room->{persistent}   && $room->{persistent}   !~ m/^0|1$/) ||
+       $room->{max_members}  !~ m/^\d+$/){
    return 0;
  }
+  # Merge old and new params
+  $room = { %$old_room, %$room };
  my $sth = eval {
    $self->db->prepare('UPDATE `rooms`
                          SET `locked`=?,