Skip to content

Commit f2ea5cb

Browse files
Updated CCD library to latest version
Also updated to v1.1.1
1 parent 67303d1 commit f2ea5cb

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

AMDInfo/CCD.cs

+11
Original file line numberDiff line numberDiff line change
@@ -637,22 +637,33 @@ public bool Equals(DISPLAYCONFIG_MODE_INFO other)
637637
if (InfoType != other.InfoType)
638638
return false;
639639

640+
// This happens when it is a target mode info block
640641
if (InfoType == DISPLAYCONFIG_MODE_INFO_TYPE.DISPLAYCONFIG_MODE_INFO_TYPE_TARGET &&
641642
Id == other.Id &&
642643
TargetMode.Equals(other.TargetMode))
643644
return true;
644645

646+
// This happens when it is a source mode info block
645647
if (InfoType == DISPLAYCONFIG_MODE_INFO_TYPE.DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE &&
646648
//Id == other.Id && // Disabling this check as as the Display ID it maps to will change after a switch from surround to non-surround profile, ruining the equality match
647649
// Only seems to be a problem with the DISPLAYCONFIG_MODE_INFO_TYPE.DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE options weirdly enough!
648650
SourceMode.Equals(other.SourceMode))
649651
return true;
650652

653+
// This happens when it is a desktop image mode info block
651654
if (InfoType == DISPLAYCONFIG_MODE_INFO_TYPE.DISPLAYCONFIG_MODE_INFO_TYPE_DESKTOP_IMAGE &&
652655
Id == other.Id &&
653656
DesktopImageInfo.Equals(other.DesktopImageInfo))
654657
return true;
655658

659+
// This happens when it is a clone - there is an extra entry with all zeros in it!
660+
if (InfoType == DISPLAYCONFIG_MODE_INFO_TYPE.Zero &&
661+
Id == other.Id &&
662+
DesktopImageInfo.Equals(other.DesktopImageInfo) &&
663+
TargetMode.Equals(other.TargetMode) &&
664+
SourceMode.Equals(other.SourceMode))
665+
return true;
666+
656667
return false;
657668
}
658669

AMDInfo/Program.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ static void Main(string[] args)
5252
NLog.LogManager.Configuration = config;
5353

5454
// Start the Log file
55-
SharedLogger.logger.Info($"AMDInfo/Main: Starting AMDInfo v1.1.0");
55+
SharedLogger.logger.Info($"AMDInfo/Main: Starting AMDInfo v1.1.1");
5656

5757

58-
Console.WriteLine($"\nAMDInfo v1.1.0");
58+
Console.WriteLine($"\nAMDInfo v1.1.1");
5959
Console.WriteLine($"==============");
6060
Console.WriteLine($"By Terry MacDonald 2021\n");
6161

AMDInfo/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.3.0")]
36-
[assembly: AssemblyFileVersion("1.0.3.0")]
35+
[assembly: AssemblyVersion("1.1.1.0")]
36+
[assembly: AssemblyFileVersion("1.1.1.0")]

0 commit comments

Comments
 (0)