From 176226545ffa9d3f2f5ec2e1879a2a5e6780538f Mon Sep 17 00:00:00 2001
From: Mark Liversedge <liversedge@gmail.com>
Date: Sat, 22 May 2021 13:10:45 +0100
Subject: [PATCH] Logical operator is && not "and" in C++

.. bit of a brain fart that g++ clearly allows, whilst MSVC doesn't.
---
 src/Gui/ColorButton.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Gui/ColorButton.cpp b/src/Gui/ColorButton.cpp
index dab1da682..fff0f0a0a 100644
--- a/src/Gui/ColorButton.cpp
+++ b/src/Gui/ColorButton.cpp
@@ -138,7 +138,7 @@ GColorDialog::GColorDialog(QColor selected, QWidget *parent) : QDialog(parent),
     tabwidget->addTab(colordialog, tr("Custom"));
 
     // set the default to the current selection
-    if (original.red() == 1 and original.green() == 1) {
+    if (original.red() == 1 && original.green() == 1) {
         tabwidget->setCurrentIndex(0);
         colorlist->setCurrentItem(colorlist->invisibleRootItem()->child(original.blue()));
         colordialog->setCurrentColor(GColor(original.blue()));