Update from firstforge (upstream), where the recent commit msgs are:
------------------------------------------------------------------------
r3615 | bamiller | 2013-02-07 14:27:03 -0800 (Thu, 07 Feb 2013) | 1 line
Make subsystems status only update SmartDashboard on changes.
------------------------------------------------------------------------
r3619 | fbsilberberg | 2013-02-18 19:27:00 -0800 (Mon, 18 Feb 2013) | 1 line
Added Preferences fix from Java to C++.
------------------------------------------------------------------------
r3620 | fbsilberberg | 2013-02-19 13:44:50 -0800 (Tue, 19 Feb 2013) | 1 line
Updated minimum CANJaguar version to 101, as per Rule 61-4.
------------------------------------------------------------------------
r3621 | mwills | 2013-02-19 13:48:39 -0800 (Tue, 19 Feb 2013) | 1 line
Merged NTr380 (fixes introduction of null values)
------------------------------------------------------------------------
r3622 | mwills | 2013-03-02 11:29:17 -0800 (Sat, 02 Mar 2013) | 1 line
Merged NTr381 (removed TCP_NODELAY)
------------------------------------------------------------------------
r3623 | mwills | 2013-03-02 15:40:44 -0800 (Sat, 02 Mar 2013) | 3 lines
Merged some changes from Peter Johnson
- Initialize m_table to NULL in many classes
- Add NULL checks to some live window code
------------------------------------------------------------------------
git-svn-id: https://robotics.mvla.net/svn/frc971/2013/trunk/src@4176 f308d9b7-e957-4cde-b6ac-9a88185e7312
diff --git a/azaleasource/WPILibCProgramming/trunk/WPILib/Solenoid.cpp b/azaleasource/WPILibCProgramming/trunk/WPILib/Solenoid.cpp
index 498a969..2b753d3 100644
--- a/azaleasource/WPILibCProgramming/trunk/WPILib/Solenoid.cpp
+++ b/azaleasource/WPILibCProgramming/trunk/WPILib/Solenoid.cpp
@@ -14,6 +14,7 @@
*/
void Solenoid::InitSolenoid()
{
+ m_table = NULL;
char buf[64];
if (!CheckSolenoidModule(m_moduleNumber))
{
@@ -115,12 +116,16 @@
void Solenoid::StartLiveWindowMode() {
Set(false);
- m_table->AddTableListener("Value", this, true);
+ if (m_table != NULL) {
+ m_table->AddTableListener("Value", this, true);
+ }
}
void Solenoid::StopLiveWindowMode() {
Set(false);
- m_table->RemoveTableListener(this);
+ if (m_table != NULL) {
+ m_table->RemoveTableListener(this);
+ }
}
std::string Solenoid::GetSmartDashboardType() {