commit 83cb86d12bc154a0092e7d72d472258f994fa559
author Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Mon Mar 23 15:43:52 2020 -0400
committer Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Mon Mar 23 15:44:25 2020 -0400
tree 2865a4536de36ef476ff213d070de03da2abc1ef
parent e9eb38b348abc88090352144a3f7b06c21e7d315

account settings: fix codec selection

Change-Id: I850bdd7d70fb4afbee77abdad22503ade0d2908c

src/AccAdvancedVC.mm

diff --git a/src/AccAdvancedVC.mm b/src/AccAdvancedVC.mm
index 00eefe8..cf3ad2a 100644
--- a/src/AccAdvancedVC.mm
+++ b/src/AccAdvancedVC.mm
@@ -293,7 +293,7 @@
         return;
     }
     auto audioCodecs = self.accountModel->getAccountInfo(self.selectedAccountID).codecModel->getAudioCodecs();
-    if (audioCodecs.size() < row) {
+    if ((audioCodecs.size() - 1) < row) {
         return;
     }
     auto codec = audioCodecs[row];
@@ -311,7 +311,7 @@
         return;
     }
     auto audioCodecs = self.accountModel->getAccountInfo(self.selectedAccountID).codecModel->getAudioCodecs();
-    if (audioCodecs.size() < row) {
+    if ((audioCodecs.size() - 1) < row) {
         return;
     }
     auto codec = audioCodecs[row];
@@ -329,7 +329,7 @@
         return;
     }
     auto videoCodecs = self.accountModel->getAccountInfo(self.selectedAccountID).codecModel->getVideoCodecs();
-    if (videoCodecs.size() < row) {
+    if ((videoCodecs.size() - 1) < row) {
         return;
     }
     auto codec = videoCodecs[row];
@@ -347,7 +347,7 @@
         return;
     }
     auto videoCodecs = self.accountModel->getAccountInfo(self.selectedAccountID).codecModel->getVideoCodecs();
-    if (videoCodecs.size() < row) {
+    if ((videoCodecs.size() - 1) < row) {
         return;
     }
     auto codec = videoCodecs[row];
@@ -377,7 +377,7 @@
         return;
     }
     auto audioCodecs = self.accountModel->getAccountInfo(self.selectedAccountID).codecModel->getAudioCodecs();
-    if (audioCodecs.size() < row) {
+    if ((audioCodecs.size()-1) < row) {
         return;
     }
     auto codec = audioCodecs[row];
@@ -393,7 +393,7 @@
         return;
     }
     auto videoCodecs = self.accountModel->getAccountInfo(self.selectedAccountID).codecModel->getVideoCodecs();
-    if (videoCodecs.size() < row) {
+    if ((videoCodecs.size()-1) < row) {
         return;
     }
     auto codec = videoCodecs[row];
@@ -406,12 +406,12 @@
 - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
 {
     if(tableView == audioCodecView) {
-        NSTableCellView* audioCodecView = [tableView makeViewWithIdentifier:@"TableCellAudioCodecItem" owner:self];
-        NSTextField* nameLabel = [audioCodecView viewWithTag: AUDIO_CODEC_NAME_TAG];
-        NSTextField* samplerateLabel = [audioCodecView viewWithTag: AUDIO_CODEC_SAMPLERATE_TAG];
-        NSButton* codecEnableButton = [audioCodecView viewWithTag: AUDIO_CODEC_ENABLE_TAG];
+        NSTableCellView* audioCodecCell = [tableView makeViewWithIdentifier:@"TableCellAudioCodecItem" owner:self];
+        NSTextField* nameLabel = [audioCodecCell viewWithTag: AUDIO_CODEC_NAME_TAG];
+        NSTextField* samplerateLabel = [audioCodecCell viewWithTag: AUDIO_CODEC_SAMPLERATE_TAG];
+        NSButton* codecEnableButton = [audioCodecCell viewWithTag: AUDIO_CODEC_ENABLE_TAG];
         auto audioCodecs = self.accountModel->getAccountInfo(self.selectedAccountID).codecModel->getAudioCodecs();
-        if (audioCodecs.size() < row) {
+        if ((audioCodecs.size() - 1) < row) {
             return nil;
         }
         auto codec = audioCodecs[row];
@@ -420,15 +420,15 @@
         [codecEnableButton setState:codec.enabled];
         [codecEnableButton setAction:@selector(enableAudioCodec:)];
         [codecEnableButton setTarget:self];
-        return audioCodecView;
+        return audioCodecCell;
     } else if (tableView == videoCodecView) {
-        NSTableCellView* videoCodecView = [tableView makeViewWithIdentifier:@"TableCellVideoCodecItem" owner:self];
-        NSTextField* nameLabel = [videoCodecView viewWithTag: VIDEO_CODEC_NAME_TAG];
-        NSButton* codecEnableButton = [audioCodecView viewWithTag: VIDIO_CODEC_ENABLE_TAG];
+        NSTableCellView* videoCodecCell = [tableView makeViewWithIdentifier:@"TableCellVideoCodecItem" owner:self];
+        NSTextField* nameLabel = [videoCodecCell viewWithTag: VIDEO_CODEC_NAME_TAG];
+        NSButton* codecEnableButton = [videoCodecCell viewWithTag: VIDIO_CODEC_ENABLE_TAG];
         nameLabel.textColor = [tableView isEnabled] ? [NSColor labelColor] : [NSColor lightGrayColor];
         [codecEnableButton setEnabled:[tableView isEnabled]];
         auto codecs = self.accountModel->getAccountInfo(self.selectedAccountID).codecModel->getVideoCodecs();
-        if (codecs.size() < row) {
+        if ((codecs.size() - 1) < row) {
             return nil;
         }
         auto codec = codecs[row];
@@ -436,7 +436,7 @@
         [codecEnableButton setState:codec.enabled];
         [codecEnableButton setAction:@selector(enableVideoCodec:)];
         [codecEnableButton setTarget:self];
-        return videoCodecView;
+        return videoCodecCell;
     }
 }