github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-19 13:10:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for the problem described here: https://sourceforge.net/p/greenshot/discussion/676082/thread/2962d1ac

Browse source
This commit is contained in:
Robin Krom 2014-09-11 19:19:12 +00:00
commit 7d6c89fcdb
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Greenshot/Helpers/CopyData.cs
View file

@ -109,7 +109,7 @@ namespace Greenshot.Helpers {
BinaryFormatter b = new BinaryFormatter(); BinaryFormatter b = new BinaryFormatter();
CopyDataObjectData cdo = (CopyDataObjectData) b.Deserialize(stream); CopyDataObjectData cdo = (CopyDataObjectData) b.Deserialize(stream);
if (channels.Contains(cdo.Channel)) { if (channels != null && channels.Contains(cdo.Channel)) {
CopyDataReceivedEventArgs d = new CopyDataReceivedEventArgs(cdo.Channel, cdo.Data, cdo.Sent); CopyDataReceivedEventArgs d = new CopyDataReceivedEventArgs(cdo.Channel, cdo.Data, cdo.Sent);
OnCopyDataReceived(d); OnCopyDataReceived(d);
m.Result = (IntPtr) 1; m.Result = (IntPtr) 1;
@ -119,7 +119,9 @@ namespace Greenshot.Helpers {
// WM_DESTROY fires before OnHandleChanged and is // WM_DESTROY fires before OnHandleChanged and is
// a better place to ensure that we've cleared // a better place to ensure that we've cleared
// everything up. // everything up.
channels.OnHandleChange(); if (channels != null) {
channels.OnHandleChange();
}
base.OnHandleChange(); base.OnHandleChange();
} }
base.WndProc(ref m); base.WndProc(ref m);
@ -142,7 +144,9 @@ namespace Greenshot.Helpers {
/// </summary> /// </summary>
protected override void OnHandleChange () { protected override void OnHandleChange () {
// need to clear up everything we had set. // need to clear up everything we had set.
channels.OnHandleChange(); if (channels != null) {
channels.OnHandleChange();
}
base.OnHandleChange(); base.OnHandleChange();
} }
@ -164,7 +168,7 @@ namespace Greenshot.Helpers {
/// Clears up any resources associated with this object. /// Clears up any resources associated with this object.
/// </summary> /// </summary>
protected virtual void Dispose(bool disposing) { protected virtual void Dispose(bool disposing) {
if (disposing) { if (disposing && channels != null) {
channels.Clear(); channels.Clear();
channels = null; channels = null;
} }