Commits

hardwood committed 3a3bc01

Removed Core# from SelectPackageInstance to prevent it from skipping loal SelectPackageInstance code.

  • Participants
  • Parent commits 6d7e4ff

Comments (0)

Files changed (2)

File Acquisition/Acquisition Settings.ipf

 end
 
 // Applies a loaded package instance to the given channel.  Deals with some of the hierarchical application of package instances, e.g. selecting a channel configuration often implies selecting a stimulus.  
-static Function SelectPackageInstance(module,package,instance[,special])
+Function SelectPackageInstance(module,package,instance[,special])
 	string package,instance,module,special
 	
 	special=selectstring(!paramisdefault(special),"",special)
 		case "channelConfigs":
 			Core#SetStrPackageSetting(module,"channelConfigs",name,"DAQ",DAQ) // Set the stimulus name.  
 			string stimName=GetStimulusName(chan)
-			Core#SelectPackageInstance(module,"stimuli",stimName,special=special)
+			SelectPackageInstance(module,"stimuli",stimName,special=special)
 			break
 		case "stimuli":
 			Core#SetStrPackageSetting(module,"channelConfigs",name,"stimulus",instance) // Set the stimulus name.  

File Acquisition/Acquisition Windows.ipf

 						Core#SetControlUserData(info.ctrlName,"oldLabel",newLabel)
 						Core#SetStrPackageSetting(module,"channelConfigs",name,"label_",newLabel) // Update the channel label.  
 					endif
-					Core#SelectPackageInstance(module,"channelConfigs",newLabel,special=special)
+					SelectPackageInstance(module,"channelConfigs",newLabel,special=special)
 					SetVariable $info.ctrlName userData(oldLabel)=Labels[chan]
 					string chanName=GetChanName(chan)
 					if(!stringmatch(newLabel,chanName))
 					break
 				default:
 					string stimName=info.popStr
-					Core#SelectPackageInstance(module,"stimuli",stimName,special=special)
+					SelectPackageInstance(module,"stimuli",stimName,special=special)
 			endswitch
 			break
 		case "SaveMode":