From 54102d20b272e4c5c10effae761c519fb899da60 Mon Sep 17 00:00:00 2001
From: David Smith <39445562+smithdc1@users.noreply.github.com>
Date: Wed, 27 Jan 2021 20:10:11 +0000
Subject: [PATCH] Improved performance of
 django.forms.ChoiceWidget.optgroups().

---
 django/forms/widgets.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index 67e44829ff..1e67857c31 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -606,8 +606,8 @@ class ChoiceWidget(Widget):
 
             for subvalue, sublabel in choices:
                 selected = (
-                    str(subvalue) in value and
-                    (not has_selected or self.allow_multiple_selected)
+                    (not has_selected or self.allow_multiple_selected) and
+                    str(subvalue) in value
                 )
                 has_selected |= selected
                 subgroup.append(self.create_option(