Automatic merge of client:master into master

openjdk · Apr 8, 2020 · 4ae50c4 · 4ae50c4
2 parents 0772c19 + f67e608
commit 4ae50c4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/java.desktop/share/classes/com/sun/media/sound/SoftMainMixer.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftMainMixer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -631,8 +631,8 @@ void processAudioBuffers() {
                 if (!hasactivevoices) {
                     synchronized (control_mutex) {
                         if (stoppedMixers != null) {
-                            if (stoppedMixers.contains(cmixer)) {
-                                stoppedMixers.remove(cmixer);
+                            if (stoppedMixers.contains(cmixer.mixer)) {
+                                stoppedMixers.remove(cmixer.mixer);
                                 cmixer.mixer.stop();
                             }
                         }