fix SB create/voting buttons (merge error?)
This commit is contained in:
parent
b99789b1cd
commit
6a5b204f8e
2 changed files with 2 additions and 2 deletions
|
|
@ -59,7 +59,6 @@ public class CreateSegmentButton {
|
||||||
|
|
||||||
private static boolean isButtonEnabled() {
|
private static boolean isButtonEnabled() {
|
||||||
return Settings.SB_ENABLED.get() && Settings.SB_CREATE_NEW_SEGMENT.get()
|
return Settings.SB_ENABLED.get() && Settings.SB_CREATE_NEW_SEGMENT.get()
|
||||||
&& SegmentPlaybackController.videoHasSegments()
|
|
||||||
&& !SegmentPlaybackController.isAdProgressTextVisible();
|
&& !SegmentPlaybackController.isAdProgressTextVisible();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -59,7 +59,8 @@ public class VotingButton {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean isButtonEnabled() {
|
private static boolean isButtonEnabled() {
|
||||||
return Settings.SB_ENABLED.get() && Settings.SB_CREATE_NEW_SEGMENT.get()
|
return Settings.SB_ENABLED.get() && Settings.SB_VOTING_BUTTON.get()
|
||||||
|
&& SegmentPlaybackController.videoHasSegments()
|
||||||
&& !SegmentPlaybackController.isAdProgressTextVisible();
|
&& !SegmentPlaybackController.isAdProgressTextVisible();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue